diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 41b7498273..03e33afa3a 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -11,11 +11,14 @@ # This also holds true for GitHub teams. Since almost none of our teams have write # permissions, you need to list all members of the team with commit access individually. -# GitHub actions +# CI /.github/workflows @NixOS/Security @Mic92 @zowoq +/.github/workflows/check-nix-format.yml @infinisil +/ci @infinisil -# EditorConfig +# Develompent support /.editorconfig @Mic92 @zowoq +/shell.nix @infinisil @NixOS/Security # Libraries /lib @infinisil @@ -115,8 +118,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius /nixos/modules/system/boot/loader/systemd-boot @JulienMalka # Images and installer media -/nixos/modules/installer/cd-dvd/ @samueldr -/nixos/modules/installer/sd-card/ @samueldr +/nixos/modules/installer/cd-dvd/ +/nixos/modules/installer/sd-card/ # Updaters ## update.nix @@ -127,7 +130,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius # Python-related code and docs /doc/languages-frameworks/python.section.md @mweinelt -/pkgs/development/interpreters/python/hooks @jonringer +/pkgs/development/interpreters/python/hooks # Haskell /doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier @@ -262,13 +265,13 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag /pkgs/top-level/emacs-packages.nix @adisbladis # Neovim -/pkgs/applications/editors/neovim @figsoda @jonringer @teto +/pkgs/applications/editors/neovim @figsoda @teto # VimPlugins -/pkgs/applications/editors/vim/plugins @figsoda @jonringer +/pkgs/applications/editors/vim/plugins @figsoda # VsCode Extensions -/pkgs/applications/editors/vscode/extensions @jonringer +/pkgs/applications/editors/vscode/extensions # PHP interpreter, packages, extensions, tests and documentation /doc/languages-frameworks/php.section.md @aanderse @drupol @globin @ma27 @talyz @@ -288,9 +291,9 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag /pkgs/applications/blockchains @mmahut @RaghavSood # Go -/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq -/pkgs/build-support/go @kalbasit @Mic92 @zowoq -/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq +/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq +/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq +/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq # GNOME /pkgs/desktops/gnome @jtojnar @@ -313,10 +316,10 @@ nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange # Dotnet -/pkgs/build-support/dotnet @IvarWithoutBones -/pkgs/development/compilers/dotnet @IvarWithoutBones -/pkgs/test/dotnet @IvarWithoutBones -/doc/languages-frameworks/dotnet.section.md @IvarWithoutBones +/pkgs/build-support/dotnet @corngood +/pkgs/development/compilers/dotnet @corngood +/pkgs/test/dotnet @corngood +/doc/languages-frameworks/dotnet.section.md @corngood # Node.js /pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt @@ -378,4 +381,3 @@ pkgs/os-specific/linux/lxc/ @adamcstephens /pkgs/os-specific/linux/checkpolicy @RossComputerGuy /pkgs/os-specific/linux/libselinux @RossComputerGuy /pkgs/os-specific/linux/libsepol @RossComputerGuy - diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index 188d270974..3aad0b4e96 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.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@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index a5ada7a6e2..43213cf2df 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -18,7 +18,7 @@ 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@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 with: diff --git a/third_party/nixpkgs/.github/workflows/check-by-name.yml b/third_party/nixpkgs/.github/workflows/check-by-name.yml index ce7802f4aa..7b08d9f951 100644 --- a/third_party/nixpkgs/.github/workflows/check-by-name.yml +++ b/third_party/nixpkgs/.github/workflows/check-by-name.yml @@ -81,7 +81,7 @@ jobs: else echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." fi - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 if: env.mergedSha with: # pull_request_target checks out the base branch by default diff --git a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml index 67a5506bcc..eb93d3f98d 100644 --- a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml +++ b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 filter: blob:none diff --git a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index 8de3318589..e620e6563e 100644 --- a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/check-nix-format.yml b/third_party/nixpkgs/.github/workflows/check-nix-format.yml index 131803213c..fc8711a7cd 100644 --- a/third_party/nixpkgs/.github/workflows/check-nix-format.yml +++ b/third_party/nixpkgs/.github/workflows/check-nix-format.yml @@ -15,17 +15,22 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge + - name: Get Nixpkgs revision for nixfmt + run: | + # pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt + # from staging + # This should not be a URL, because it would allow PRs to run arbitrary code in CI! + rev=$(jq -r .rev ci/pinned-nixpkgs.json) + echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # explicitly enable sandbox extra_nix_config: sandbox = true - # fix a commit from nixpkgs-unstable to avoid e.g. building nixfmt - # from staging - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/4b455dc2048f73a79eb3713f342369ff58f93e0b.tar.gz + nix_path: nixpkgs=${{ env.url }} - name: Install nixfmt run: "nix-env -f '' -iAP nixfmt-rfc-style" - name: Check that Nix files are formatted according to the RFC style @@ -35,14 +40,14 @@ jobs: NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts # Format paths related to the Nixpkgs CUDA ecosystem. - NIX_FMT_PATHS_CUDA: | + NIX_FMT_PATHS_CUDA: |- pkgs/development/cuda-modules pkgs/test/cuda pkgs/top-level/cuda-packages.nix - NIX_FMT_PATHS_MAINTAINERS: | + NIX_FMT_PATHS_MAINTAINERS: |- maintainers/maintainer-list.nix maintainers/team-list.nix - NIX_FMT_PATHS_K3S: | + NIX_FMT_PATHS_K3S: |- nixos/modules/services/cluster/k3s nixos/tests/k3s pkgs/applications/networking/cluster/k3s @@ -51,6 +56,7 @@ jobs: NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php # Iterate over all environment variables beginning with NIX_FMT_PATHS_. run: | + unformattedPaths=() for env_var in "${!NIX_FMT_PATHS_@}"; do readarray -t paths <<< "${!env_var}" if [[ "${paths[*]}" == "" ]]; then @@ -59,7 +65,12 @@ jobs: fi echo "Checking paths: ${paths[@]}" if ! nixfmt --check "${paths[@]}"; then - echo "Error: nixfmt failed." - exit 1 + unformattedPaths+=("${paths[@]}") fi done + if (( "${#unformattedPaths[@]}" > 0 )); then + echo "Some required Nix files are not properly formatted" + echo "Please run the following in \`nix-shell\`:" + echo "nixfmt ${unformattedPaths[*]@Q}" + exit 1 + fi diff --git a/third_party/nixpkgs/.github/workflows/check-shell.yml b/third_party/nixpkgs/.github/workflows/check-shell.yml new file mode 100644 index 0000000000..bac117f26d --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/check-shell.yml @@ -0,0 +1,29 @@ +name: "Check shell" + +on: + pull_request_target: + +permissions: {} + +jobs: + x86_64-linux: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + 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@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + - name: Build shell + run: nix-build shell.nix + + aarch64-darwin: + runs-on: macos-latest + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + 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@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + - name: Build shell + run: nix-build shell.nix diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index b2b9672299..50bf0a868f 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index f841fcadc5..20f092932f 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml index 7b2cef0e10..45486fa96a 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/nix-parse.yml b/third_party/nixpkgs/.github/workflows/nix-parse.yml index ffccf9d53d..19f3e8b5fd 100644 --- a/third_party/nixpkgs/.github/workflows/nix-parse.yml +++ b/third_party/nixpkgs/.github/workflows/nix-parse.yml @@ -24,7 +24,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index 261a2cdba4..519d90c442 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -35,17 +35,13 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-23.11 - into: staging-next-23.11 - - from: staging-next-23.11 - into: staging-23.11 - from: release-24.05 into: staging-next-24.05 - from: staging-next-24.05 into: staging-24.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index 0a22905260..ed2a8a79e3 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index a1c949ba37..f44207f731 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -16,7 +16,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable diff --git a/third_party/nixpkgs/ci/README.md b/third_party/nixpkgs/ci/README.md new file mode 100644 index 0000000000..64cd8e5bce --- /dev/null +++ b/third_party/nixpkgs/ci/README.md @@ -0,0 +1,12 @@ +# 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. + +## Pinned Nixpkgs + +CI may need certain packages from Nixpkgs. +In order to ensure that the needed packages are generally available without building, +[`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. diff --git a/third_party/nixpkgs/ci/pinned-nixpkgs.json b/third_party/nixpkgs/ci/pinned-nixpkgs.json new file mode 100644 index 0000000000..29af1b0225 --- /dev/null +++ b/third_party/nixpkgs/ci/pinned-nixpkgs.json @@ -0,0 +1,4 @@ +{ + "rev": "cfb89a95f19bea461fc37228dc4d07b22fe617c2", + "sha256": "1yhsacvry6j8r02lk70p9dphjpi8lpzgq2qay8hiy4nqlys0mrch" +} diff --git a/third_party/nixpkgs/ci/update-pinned-nixpkgs.sh b/third_party/nixpkgs/ci/update-pinned-nixpkgs.sh new file mode 100755 index 0000000000..7765581300 --- /dev/null +++ b/third_party/nixpkgs/ci/update-pinned-nixpkgs.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq + +set -euo pipefail + +# https://stackoverflow.com/a/246128 +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +repo=https://github.com/nixos/nixpkgs +branch=nixpkgs-unstable +file=$SCRIPT_DIR/pinned-nixpkgs.json + +rev=$(git ls-remote "$repo" refs/heads/"$branch" | cut -f1) +sha256=$(nix-prefetch-url --unpack "$repo/archive/$rev.tar.gz" --name source) + +jq -n --arg rev "$rev" --arg sha256 "$sha256" '$ARGS.named' | tee /dev/stderr > $file diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index fd623cf15b..d4a0bfc9c9 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -23,6 +23,7 @@ let { name = "fileset"; description = "file set functions"; } { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } + { name = "generators"; description = "functions that create file formats from nix data structures"; } { name = "gvariant"; description = "GVariant formatted string serialization functions"; } { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } { name = "meta"; description = "functions for derivation metadata"; } diff --git a/third_party/nixpkgs/doc/functions/generators.section.md b/third_party/nixpkgs/doc/functions/generators.section.md index dbfc302a3a..9d71a02401 100644 --- a/third_party/nixpkgs/doc/functions/generators.section.md +++ b/third_party/nixpkgs/doc/functions/generators.section.md @@ -54,4 +54,4 @@ merge:"diff3" Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`. ::: -Detailed documentation for each generator can be found in `lib/generators.nix`. +Detailed documentation for each generator can be found [here](#sec-functions-library-generators) diff --git a/third_party/nixpkgs/doc/languages-frameworks/android.section.md b/third_party/nixpkgs/doc/languages-frameworks/android.section.md index d6ed1f35cb..db4aea04e5 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/android.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/android.section.md @@ -232,11 +232,11 @@ In addition to prebuilt APKs, you can also bind the APK parameter to a ## Notes on environment variables in Android projects {#notes-on-environment-variables-in-android-projects} -* `ANDROID_SDK_ROOT` should point to the Android SDK. In your Nix expressions, this should be - `${androidComposition.androidsdk}/libexec/android-sdk`. Note that `ANDROID_HOME` is deprecated, +* `ANDROID_HOME` should point to the Android SDK. In your Nix expressions, this should be + `${androidComposition.androidsdk}/libexec/android-sdk`. Note that `ANDROID_SDK_ROOT` is deprecated, but if you rely on tools that need it, you can export it too. * `ANDROID_NDK_ROOT` should point to the Android NDK, if you're doing NDK development. - In your Nix expressions, this should be `${ANDROID_SDK_ROOT}/ndk-bundle`. + In your Nix expressions, this should be `${ANDROID_HOME}/ndk-bundle`. If you are running the Android Gradle plugin, you need to export GRADLE_OPTS to override aapt2 to point to the aapt2 binary in the Nix store as well, or use a FHS environment so the packaged @@ -250,11 +250,11 @@ let androidComposition = <...>; in pkgs.mkShell rec { - ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk"; - ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_HOME}/ndk-bundle"; # Use the same buildToolsVersion here - GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2"; + GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/${buildToolsVersion}/aapt2"; } ``` @@ -270,18 +270,18 @@ let androidComposition = <...>; in pkgs.mkShell rec { - ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk"; - ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_HOME}/ndk-bundle"; # Use the same cmakeVersion here shellHook = '' - export PATH="$(echo "$ANDROID_SDK_ROOT/cmake/${cmakeVersion}".*/bin):$PATH" + export PATH="$(echo "$ANDROID_HOME/cmake/${cmakeVersion}".*/bin):$PATH" ''; } ``` -Note that running Android Studio with ANDROID_SDK_ROOT set will automatically write a -`local.properties` file with `sdk.dir` set to $ANDROID_SDK_ROOT if one does not already +Note that running Android Studio with ANDROID_HOME set will automatically write a +`local.properties` file with `sdk.dir` set to $ANDROID_HOME if one does not already exist. If you are using the NDK as well, you may have to add `ndk.dir` to this file. An example shell.nix that does all this for you is provided in examples/shell.nix. diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 36c20a9e9c..caf213845e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -141,9 +141,7 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - # File generated with `nix-build -A package.passthru.fetch-deps`. - # To run fetch-deps when this file does not yet exist, set nugetDeps to null - nugetDeps = ./deps.nix; + nugetDeps = ./deps.nix; # see "Generating and updating NuGet dependencies" section for details projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. @@ -219,6 +217,12 @@ 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, +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`.) + +There is also a manual method: First, restore the packages to the `out` directory, ensure you have cloned the upstream repository and you are inside it. @@ -254,6 +258,5 @@ Finally, you move the `deps.nix` file to the appropriate location to be used by If you ever need to update the dependencies of a package, you instead do * `nix-build -A package.fetch-deps` to generate the update script for `package` -* Run `./result deps.nix` to regenerate the lockfile to `deps.nix`, keep in mind if a location isn't provided, it will write to a temporary path instead -* Finally, move the file where needed and look at its contents to confirm it has updated the dependencies. - +* Run `./result` to regenerate the lockfile to the path passed for `nugetDeps` (keep in mind if it can't be resolved to a local path, the script will write to `$1` or a temporary path instead) +* Finally, ensure the correct file was written and the derivation can be built. diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index 6c2af33c8c..e8970b2d03 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -21,25 +21,14 @@ Many “normal” user facing packages written in Haskell, like `niv` or `cachix are also exposed at the top level, and there is nothing Haskell specific to installing and using them. -All of these packages are originally defined in the `haskellPackages` package -set and are re-exposed with a reduced dependency closure for convenience. -(see `justStaticExecutables` or `separateBinOutput` below) +All of these packages are originally defined in the `haskellPackages` package set. +The same packages are re-exposed with a reduced dependency closure for convenience (see `justStaticExecutables` or `separateBinOutput` below). -The `haskellPackages` set includes at least one version of every package from -Hackage as well as some manually injected packages. This amounts to a lot of -packages, so it is hidden from `nix-env -qa` by default for performance reasons. -You can still list all packages in the set like this: +:::{.note} +See [](#chap-language-support) for techniques to explore package sets. +::: -```console -$ nix-env -f '' -qaP -A haskellPackages -haskellPackages.a50 a50-0.5 -haskellPackages.AAI AAI-0.2.0.1 -haskellPackages.aasam aasam-0.2.0.0 -haskellPackages.abacate abacate-0.0.0.0 -haskellPackages.abc-puzzle abc-puzzle-0.2.1 -… -``` -Also, the `haskellPackages` set is included on [search.nixos.org]. +The `haskellPackages` set includes at least one version of every package from [Hackage](https://hackage.haskell.org/) as well as some manually injected packages. The attribute names in `haskellPackages` always correspond with their name on Hackage. Since Hackage allows names that are not valid Nix without escaping, @@ -49,8 +38,7 @@ For packages that are part of [Stackage] (a curated set of known to be compatible packages), we use the version prescribed by a Stackage snapshot (usually the current LTS one) as the default version. For all other packages we use the latest version from [Hackage](https://hackage.org) (the repository of -basically all open source Haskell packages). See [below](#haskell-available- -versions) for a few more details on this. +basically all open source Haskell packages). See [below](#haskell-available-versions) for a few more details on this. Roughly half of the 16K packages contained in `haskellPackages` don’t actually build and are [marked as broken semi-automatically](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml). @@ -63,68 +51,15 @@ How you can help with that is described in [Fixing a broken package](#haskell-fixing-a-broken-package). --> -`haskellPackages` is built with our default compiler, but we also provide other -releases of GHC and package sets built with them. You can list all available -compilers like this: +`haskellPackages` is built with our default compiler, but we also provide other releases of GHC and package sets built with them. +Available compilers are collected under `haskell.compiler`. -```console -$ nix-env -f '' -qaP -A haskell.compiler -haskell.compiler.ghc810 ghc-8.10.7 -haskell.compiler.ghc90 ghc-9.0.2 -haskell.compiler.ghc925 ghc-9.2.5 -haskell.compiler.ghc926 ghc-9.2.6 -haskell.compiler.ghc927 ghc-9.2.7 -haskell.compiler.ghc92 ghc-9.2.8 -haskell.compiler.ghc945 ghc-9.4.5 -haskell.compiler.ghc946 ghc-9.4.6 -haskell.compiler.ghc947 ghc-9.4.7 -haskell.compiler.ghc94 ghc-9.4.8 -haskell.compiler.ghc963 ghc-9.6.3 -haskell.compiler.ghc96 ghc-9.6.4 -haskell.compiler.ghc98 ghc-9.8.1 -haskell.compiler.ghcHEAD ghc-9.9.20231121 -haskell.compiler.ghc8107Binary ghc-binary-8.10.7 -haskell.compiler.ghc865Binary ghc-binary-8.6.5 -haskell.compiler.ghc924Binary ghc-binary-9.2.4 -haskell.compiler.integer-simple.ghc8107 ghc-integer-simple-8.10.7 -haskell.compiler.integer-simple.ghc810 ghc-integer-simple-8.10.7 -haskell.compiler.native-bignum.ghc90 ghc-native-bignum-9.0.2 -haskell.compiler.native-bignum.ghc902 ghc-native-bignum-9.0.2 -haskell.compiler.native-bignum.ghc925 ghc-native-bignum-9.2.5 -haskell.compiler.native-bignum.ghc926 ghc-native-bignum-9.2.6 -haskell.compiler.native-bignum.ghc927 ghc-native-bignum-9.2.7 -haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.8 -haskell.compiler.native-bignum.ghc928 ghc-native-bignum-9.2.8 -haskell.compiler.native-bignum.ghc945 ghc-native-bignum-9.4.5 -haskell.compiler.native-bignum.ghc946 ghc-native-bignum-9.4.6 -haskell.compiler.native-bignum.ghc947 ghc-native-bignum-9.4.7 -haskell.compiler.native-bignum.ghc94 ghc-native-bignum-9.4.8 -haskell.compiler.native-bignum.ghc948 ghc-native-bignum-9.4.8 -haskell.compiler.native-bignum.ghc963 ghc-native-bignum-9.6.3 -haskell.compiler.native-bignum.ghc96 ghc-native-bignum-9.6.4 -haskell.compiler.native-bignum.ghc964 ghc-native-bignum-9.6.4 -haskell.compiler.native-bignum.ghc98 ghc-native-bignum-9.8.1 -haskell.compiler.native-bignum.ghc981 ghc-native-bignum-9.8.1 -haskell.compiler.native-bignum.ghcHEAD ghc-native-bignum-9.9.20231121 -haskell.compiler.ghcjs ghcjs-8.10.7 -``` - -Each of those compiler versions has a corresponding attribute set built using +Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias for `haskell.packages.ghc964`: -```console -$ nix-env -f '' -qaP -A haskell.packages.ghc927 -haskell.packages.ghc927.a50 a50-0.5 -haskell.packages.ghc927.AAI AAI-0.2.0.1 -haskell.packages.ghc927.aasam aasam-0.2.0.0 -haskell.packages.ghc927.abacate abacate-0.0.0.0 -haskell.packages.ghc927.abc-puzzle abc-puzzle-0.2.1 -… -``` - Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. ### Available package versions {#haskell-available-versions} diff --git a/third_party/nixpkgs/doc/languages-frameworks/idris2.section.md b/third_party/nixpkgs/doc/languages-frameworks/idris2.section.md index f1f0277cc6..3ea9b4f988 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/idris2.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/idris2.section.md @@ -19,7 +19,7 @@ let lspLibPkg = idris2Packages.buildIdris { }; idrisLibraries = [ ]; }; -in lspLibPkg.library +in lspLibPkg.library { withSource = true; } ``` The above results in a derivation with the installed library results (with sourcecode). @@ -30,6 +30,7 @@ A slightly more involved example of a fully packaged executable would be the [`i # Assuming the previous example lives in `lsp-lib.nix`: let lspLib = callPackage ./lsp-lib.nix { }; + inherit (idris2Packages) idris2Api; lspPkg = idris2Packages.buildIdris { ipkgName = "idris2-lsp"; src = fetchFromGitHub { @@ -38,10 +39,9 @@ let lspLib = callPackage ./lsp-lib.nix { }; rev = "main"; hash = "sha256-vQTzEltkx7uelDtXOHc6QRWZ4cSlhhm5ziOqWA+aujk="; }; - idrisLibraries = [(idris2Packages.idris2Api { }) (lspLib { })]; + idrisLibraries = [idris2Api lspLib]; }; in lspPkg.executable ``` -The above uses the default value of `withSource = false` for both of the two required Idris libraries that the `idris2-lsp` executable depends on. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler. - +The above uses the default value of `withSource = false` for the `idris2Api` but could be modified to include that library's source by passing `(idris2Api { withSource = true; })` to `idrisLibraries` instead. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler. diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.md b/third_party/nixpkgs/doc/languages-frameworks/index.md index e8fee9c452..32cb212162 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.md +++ b/third_party/nixpkgs/doc/languages-frameworks/index.md @@ -2,6 +2,54 @@ The [standard build environment](#chap-stdenv) makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accommodated by overriding the appropriate phases of `stdenv`. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. +Each supported language or software ecosystem has its own package set named `Packages`, which can be explored in various ways: + +- Search on [search.nixos.org](https://search.nixos.org/packages) + + For example, search for [`haskellPackages`](https://search.nixos.org/packages?query=haskellPackages) or [`rubyPackages`](https://search.nixos.org/packages?query=rubyPackages). + +- Navigate attribute sets with [`nix repl`](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-repl). + + This technique is generally useful to inspect Nix language data structures. + + :::{.example #example-navigte-nix-repl} + + # Navigate Java compiler variants in `javaPackages` with `nix repl` + + ```shell-session + $ nix repl '' -I nixpkgs=channel:nixpkgs-unstable + nix-repl> javaPackages. + javaPackages.compiler javaPackages.openjfx15 javaPackages.openjfx21 javaPackages.recurseForDerivations + javaPackages.jogl_2_4_0 javaPackages.openjfx17 javaPackages.openjfx22 + javaPackages.mavenfod javaPackages.openjfx19 javaPackages.override + javaPackages.openjfx11 javaPackages.openjfx20 javaPackages.overrideDerivation + ``` + ::: + +- List all derivations on the command line with [`nix-env --query`](https://nixos.org/manual/nix/stable/command-ref/nix-env/query). + + `nix-env` is the only convenient way to do that, as it will skip attributes that fail [assertions](https://nixos.org/manual/nix/stable/language/constructs#assertions), such as when a package is [marked as broken](#var-meta-broken), rather than failing the entire evaluation. + + :::{.example #example-list-haskellPackages} + + # List all Python packages in Nixpkgs + + The following command lists all [derivations names](https://nixos.org/manual/nix/stable/language/derivations#attr-name) with their attribute path from the latest Nixpkgs rolling release (`nixpkgs-unstable`). + + ```shell-session + $ nix-env -qaP -f '' -A pythonPackages -I nixpkgs=channel:nixpkgs-unstable + ``` + + ```console + pythonPackages.avahi avahi-0.8 + pythonPackages.boost boost-1.81.0 + pythonPackages.caffe caffe-1.0 + pythonPackages.caffeWithCuda caffe-1.0 + pythonPackages.cbeams cbeams-1.0.3 + … + ``` + ::: + ```{=include=} sections agda.section.md android.section.md diff --git a/third_party/nixpkgs/doc/packages/steam.section.md b/third_party/nixpkgs/doc/packages/steam.section.md index c9a09962f6..4c87eeb818 100644 --- a/third_party/nixpkgs/doc/packages/steam.section.md +++ b/third_party/nixpkgs/doc/packages/steam.section.md @@ -40,20 +40,6 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269). -- **Java** - - 1. There is no java in steam chrootenv by default. If you get a message like: - - ``` - /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - ``` - - you need to add: - - ```nix - steam.override { withJava = true; } - ``` - ## steam-run {#sec-steam-run} The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with: diff --git a/third_party/nixpkgs/lib/cli.nix b/third_party/nixpkgs/lib/cli.nix index 311037c519..b65131ac1a 100644 --- a/third_party/nixpkgs/lib/cli.nix +++ b/third_party/nixpkgs/lib/cli.nix @@ -7,8 +7,6 @@ rec { This helps protect against malformed command lines and also to reduce boilerplate related to command-line construction for simple use cases. - `toGNUCommandLine` returns a list of nix strings. - `toGNUCommandLineShell` returns an escaped shell string. @@ -16,17 +14,86 @@ rec { `options` - : 1\. Function argument + : How to format the arguments, see `toGNUCommandLine` `attrs` - : 2\. Function argument + : The attributes to transform into arguments. # Examples :::{.example} ## `lib.cli.toGNUCommandLineShell` usage example + ```nix + cli.toGNUCommandLineShell {} { + data = builtins.toJSON { id = 0; }; + X = "PUT"; + retry = 3; + retry-delay = null; + url = [ "https://example.com/foo" "https://example.com/bar" ]; + silent = false; + verbose = true; + } + => "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"; + ``` + + ::: + */ + toGNUCommandLineShell = + options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs); + + /** + Automatically convert an attribute set to a list of command-line options. + + `toGNUCommandLine` returns a list of string arguments. + + + # Inputs + + `options` + + : How to format the arguments, see below. + + `attrs` + + : The attributes to transform into arguments. + + # Options + + `mkOptionName` + + : How to string-format the option name; + By default one character is a short option (`-`), more than one characters a long option (`--`). + + `mkBool` + + : How to format a boolean value to a command list; + By default it’s a flag option (only the option name if true, left out completely if false). + + `mkList` + + : How to format a list value to a command list; + By default the option name is repeated for each value and `mkOption` is applied to the values themselves. + + + `mkOption` + + : How to format any remaining value to a command list; + On the toplevel, booleans and lists are handled by `mkBool` and `mkList`, though they can still appear as values of a list. + By default, everything is printed verbatim and complex types are forbidden (lists, attrsets, functions). `null` values are omitted. + + `optionValueSeparator` + + : How to separate an option from its flag; + By default, there is no separator, so option `-c` and value `5` would become ["-c" "5"]. + This is useful if the command requires equals, for example, `-c=5`. + + + # Examples + :::{.example} + ## `lib.cli.toGNUCommandLine` usage example + ```nix cli.toGNUCommandLine {} { data = builtins.toJSON { id = 0; }; @@ -45,48 +112,20 @@ rec { "--url" "https://example.com/bar" "--verbose" ] - - cli.toGNUCommandLineShell {} { - data = builtins.toJSON { id = 0; }; - X = "PUT"; - retry = 3; - retry-delay = null; - url = [ "https://example.com/foo" "https://example.com/bar" ]; - silent = false; - verbose = true; - } - => "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"; ``` ::: */ - toGNUCommandLineShell = - options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs); - toGNUCommandLine = { - # how to string-format the option name; - # by default one character is a short option (`-`), - # more than one characters a long option (`--`). mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}", - # how to format a boolean value to a command list; - # by default it’s a flag option - # (only the option name if true, left out completely if false). mkBool ? k: v: lib.optional v (mkOptionName k), - # how to format a list value to a command list; - # by default the option name is repeated for each value - # and `mkOption` is applied to the values themselves. mkList ? k: v: lib.concatMap (mkOption k) v, - # how to format any remaining value to a command list; - # on the toplevel, booleans and lists are handled by `mkBool` and `mkList`, - # though they can still appear as values of a list. - # By default, everything is printed verbatim and complex types - # are forbidden (lists, attrsets, functions). `null` values are omitted. mkOption ? k: v: if v == null then [] @@ -95,10 +134,6 @@ rec { else [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault {} v}" ], - # how to separate an option from its flag; - # by default, there is no separator, so option `-c` and value `5` - # would become ["-c" "5"]. - # This is useful if the command requires equals, for example, `-c=5`. optionValueSeparator ? null }: options: diff --git a/third_party/nixpkgs/lib/derivations.nix b/third_party/nixpkgs/lib/derivations.nix index 6867458f9e..9c3c4639a2 100644 --- a/third_party/nixpkgs/lib/derivations.nix +++ b/third_party/nixpkgs/lib/derivations.nix @@ -17,7 +17,7 @@ let else ""; in { - /* + /** Restrict a derivation to a predictable set of attribute names, so that the returned attrset is not strict in the actual derivation, saving a lot of computation when the derivation is non-trivial. @@ -62,25 +62,36 @@ in (lazyDerivation { inherit derivation }).pythonPath + # Inputs + + Takes an attribute set with the following attributes + + `derivation` + : The derivation to be wrapped. + + `meta` + : Optional meta attribute. + + While this function is primarily about derivations, it can improve + the `meta` package attribute, which is usually specified through + `mkDerivation`. + + `passthru` + : Optional extra values to add to the returned attrset. + + This can be used for adding package attributes, such as `tests`. + + `outputs` + : Optional list of assumed outputs. Default: ["out"] + + This must match the set of outputs that the returned derivation has. + You must use this when the derivation has multiple outputs. */ lazyDerivation = args@{ - # The derivation to be wrapped. - derivation - , # Optional meta attribute. - # - # While this function is primarily about derivations, it can improve - # the `meta` package attribute, which is usually specified through - # `mkDerivation`. - meta ? null - , # Optional extra values to add to the returned attrset. - # - # This can be used for adding package attributes, such as `tests`. - passthru ? { } - , # Optional list of assumed outputs. Default: ["out"] - # - # This must match the set of outputs that the returned derivation has. - # You must use this when the derivation has multiple outputs. + derivation, + meta ? null, + passthru ? { }, outputs ? [ "out" ] }: let @@ -149,29 +160,50 @@ in // genAttrs outputs (outputName: checked.${outputName}) // passthru; - /* Conditionally set a derivation attribute. + /** + Conditionally set a derivation attribute. - Because `mkDerivation` sets `__ignoreNulls = true`, a derivation - attribute set to `null` will not impact the derivation output hash. - Thus, this function passes through its `value` argument if the `cond` - is `true`, but returns `null` if not. + Because `mkDerivation` sets `__ignoreNulls = true`, a derivation + attribute set to `null` will not impact the derivation output hash. + Thus, this function passes through its `value` argument if the `cond` + is `true`, but returns `null` if not. - Type: optionalDrvAttr :: Bool -> a -> a | Null - Example: - (stdenv.mkDerivation { - name = "foo"; - x = optionalDrvAttr true 1; - y = optionalDrvAttr false 1; - }).drvPath == (stdenv.mkDerivation { - name = "foo"; - x = 1; - }).drvPath - => true + # Inputs + + `cond` + + : Condition + + `value` + + : Attribute value + + # Type + + ``` + optionalDrvAttr :: Bool -> a -> a | Null + ``` + + # Examples + :::{.example} + ## `lib.derivations.optionalDrvAttr` usage example + + ```nix + (stdenv.mkDerivation { + name = "foo"; + x = optionalDrvAttr true 1; + y = optionalDrvAttr false 1; + }).drvPath == (stdenv.mkDerivation { + name = "foo"; + x = 1; + }).drvPath + => true + ``` + + ::: */ optionalDrvAttr = - # Condition cond: - # Attribute value value: if cond then value else null; } diff --git a/third_party/nixpkgs/lib/filesystem.nix b/third_party/nixpkgs/lib/filesystem.nix index c416db02eb..5a78bcca4e 100644 --- a/third_party/nixpkgs/lib/filesystem.nix +++ b/third_party/nixpkgs/lib/filesystem.nix @@ -1,4 +1,4 @@ -/* +/** Functions for querying information about the filesystem without copying any files to the Nix store. */ @@ -29,19 +29,35 @@ in { - /* + /** The type of a path. The path needs to exist and be accessible. The result is either "directory" for a directory, "regular" for a regular file, "symlink" for a symlink, or "unknown" for anything else. - Type: - pathType :: Path -> String + # Inputs - Example: - pathType /. - => "directory" + path - pathType /some/file.nix - => "regular" + : The path to query + + # Type + + ``` + pathType :: Path -> String + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathType` usage example + + ```nix + pathType /. + => "directory" + + pathType /some/file.nix + => "regular" + ``` + + ::: */ pathType = builtins.readFileType or @@ -59,53 +75,97 @@ in else (readDir (dirOf path)).${baseNameOf path} ); - /* + /** Whether a path exists and is a directory. - Type: - pathIsDirectory :: Path -> Bool - Example: - pathIsDirectory /. - => true + # Inputs - pathIsDirectory /this/does/not/exist - => false + `path` - pathIsDirectory /some/file.nix - => false + : 1\. Function argument + + # Type + + ``` + pathIsDirectory :: Path -> Bool + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathIsDirectory` usage example + + ```nix + pathIsDirectory /. + => true + + pathIsDirectory /this/does/not/exist + => false + + pathIsDirectory /some/file.nix + => false + ``` + + ::: */ pathIsDirectory = path: pathExists path && pathType path == "directory"; - /* + /** Whether a path exists and is a regular file, meaning not a symlink or any other special file type. - Type: - pathIsRegularFile :: Path -> Bool - Example: - pathIsRegularFile /. - => false + # Inputs - pathIsRegularFile /this/does/not/exist - => false + `path` - pathIsRegularFile /some/file.nix - => true + : 1\. Function argument + + # Type + + ``` + pathIsRegularFile :: Path -> Bool + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathIsRegularFile` usage example + + ```nix + pathIsRegularFile /. + => false + + pathIsRegularFile /this/does/not/exist + => false + + pathIsRegularFile /some/file.nix + => true + ``` + + ::: */ pathIsRegularFile = path: pathExists path && pathType path == "regular"; - /* + /** A map of all haskell packages defined in the given path, identified by having a cabal file with the same name as the directory itself. - Type: Path -> Map String Path + + # Inputs + + `root` + + : The directory within to search + + # Type + + ``` + Path -> Map String Path + ``` */ haskellPathsInDir = - # The directory within to search root: let # Files in the root root-files = builtins.attrNames (builtins.readDir root); @@ -120,17 +180,30 @@ in builtins.pathExists (value + "/${name}.cabal") ) root-files-with-paths; in builtins.listToAttrs cabal-subdirs; - /* + /** Find the first directory containing a file matching 'pattern' upward from a given 'file'. Returns 'null' if no directories contain a file matching 'pattern'. - Type: RegExp -> Path -> Nullable { path : Path; matches : [ MatchResults ]; } + + # Inputs + + `pattern` + + : The pattern to search for + + `file` + + : The file to start searching upward from + + # Type + + ``` + RegExp -> Path -> Nullable { path : Path; matches : [ MatchResults ]; } + ``` */ locateDominatingFile = - # The pattern to search for pattern: - # The file to start searching upward from file: let go = path: let files = builtins.attrNames (builtins.readDir path); @@ -150,13 +223,23 @@ in in go (if isDir then file else parent); - /* + /** Given a directory, return a flattened list of all files within it recursively. - Type: Path -> [ Path ] + + # Inputs + + `dir` + + : The path to recursively list + + # Type + + ``` + Path -> [ Path ] + ``` */ listFilesRecursive = - # The path to recursively list dir: lib.flatten (lib.mapAttrsToList (name: type: if type == "directory" then @@ -165,7 +248,7 @@ in dir + "/${name}" ) (builtins.readDir dir)); - /* + /** Transform a directory tree containing package files suitable for `callPackage` into a matching nested attribute set of derivations. @@ -223,40 +306,57 @@ in As a result, directories with no `.nix` files (including empty directories) will be transformed into empty attribute sets. - Example: - packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; + # Inputs + + Structured function argument + + : Attribute set containing the following attributes. + Additional attributes are ignored. + + `callPackage` + + : `pkgs.callPackage` + + Type: `Path -> AttrSet -> a` + + `directory` + + : The directory to read package files from + + Type: `Path` + + + # Type + + ``` + packagesFromDirectoryRecursive :: AttrSet -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.filesystem.packagesFromDirectoryRecursive` usage example + + ```nix + packagesFromDirectoryRecursive { + inherit (pkgs) callPackage; + directory = ./my-packages; + } + => { ... } + + lib.makeScope pkgs.newScope ( + self: packagesFromDirectoryRecursive { + callPackage = self.callPackage; directory = ./my-packages; } - => { ... } + ) + => { ... } + ``` - lib.makeScope pkgs.newScope ( - self: packagesFromDirectoryRecursive { - callPackage = self.callPackage; - directory = ./my-packages; - } - ) - => { ... } - - Type: - packagesFromDirectoryRecursive :: AttrSet -> AttrSet + ::: */ packagesFromDirectoryRecursive = - # Options. { - /* - `pkgs.callPackage` - - Type: - Path -> AttrSet -> a - */ callPackage, - /* - The directory to read package files from - - Type: - Path - */ directory, ... }: diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index 5f42a98de7..4317e49c25 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -1,18 +1,23 @@ -/* Functions that generate widespread file - * formats from nix data structures. - * - * They all follow a similar interface: - * generator { config-attrs } data - * - * `config-attrs` are “holes” in the generators - * with sensible default implementations that - * can be overwritten. The default implementations - * are mostly generators themselves, called with - * their respective default values; they can be reused. - * - * Tests can be found in ./tests/misc.nix - * Documentation in the manual, #sec-generators - */ +/** + Functions that generate widespread file + formats from nix data structures. + + They all follow a similar interface: + + ```nix + generator { config-attrs } data + ``` + + `config-attrs` are “holes” in the generators + with sensible default implementations that + can be overwritten. The default implementations + are mostly generators themselves, called with + their respective default values; they can be reused. + + Tests can be found in ./tests/misc.nix + + Further Documentation can be found [here](#sec-generators). +*/ { lib }: let @@ -68,11 +73,20 @@ let ; ## -- HELPER FUNCTIONS & DEFAULTS -- +in rec { + /** + Convert a value to a sensible default string representation. + The builtin `toString` function has some strange defaults, + suitable for bash scripts but not much else. - /* Convert a value to a sensible default string representation. - * The builtin `toString` function has some strange defaults, - * suitable for bash scripts but not much else. - */ + # Inputs + + Options + : Empty set, there may be configuration options in the future + + `v` + : 2\. Function argument + */ mkValueStringDefault = {}: v: let err = t: v: abort ("generators.mkValueStringDefault: " + @@ -100,15 +114,36 @@ let else err "this value is" (toString v); - /* Generate a line of key k and value v, separated by - * character sep. If sep appears in k, it is escaped. - * Helper for synaxes with different separators. - * - * mkValueString specifies how values should be formatted. - * - * mkKeyValueDefault {} ":" "f:oo" "bar" - * > "f\:oo:bar" - */ + /** + Generate a line of key k and value v, separated by + character sep. If sep appears in k, it is escaped. + Helper for synaxes with different separators. + + mkValueString specifies how values should be formatted. + + ```nix + mkKeyValueDefault {} ":" "f:oo" "bar" + > "f\:oo:bar" + ``` + + # Inputs + + Structured function argument + : mkValueString (optional, default: `mkValueStringDefault {}`) + : Function to convert values to strings + + `sep` + + : 2\. Function argument + + `k` + + : 3\. Function argument + + `v` + + : 4\. Function argument + */ mkKeyValueDefault = { mkValueString ? mkValueStringDefault {} }: sep: k: v: @@ -118,10 +153,23 @@ let ## -- FILE FORMAT GENERATORS -- - /* Generate a key-value-style config file from an attrset. - * - * mkKeyValue is the same as in toINI. - */ + /** + Generate a key-value-style config file from an attrset. + + # Inputs + + Structured function argument + + : mkKeyValue (optional, default: `mkKeyValueDefault {} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + : indent (optional, default: `""`) + : Initial indentation level + + */ toKeyValue = { mkKeyValue ? mkKeyValueDefault {} "=", listsAsDuplicateKeys ? false, @@ -134,32 +182,51 @@ let in attrs: concatStrings (concatLists (mapAttrsToList mkLines attrs)); - /* Generate an INI-style config file from an - * attrset of sections to an attrset of key-value pairs. - * - * generators.toINI {} { - * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; - * baz = { "also, integers" = 42; }; - * } - * - *> [baz] - *> also, integers=42 - *> - *> [foo] - *> ciao=bar - *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 - * - * The mk* configuration attributes can generically change - * the way sections and key-value strings are generated. - * - * For more examples see the test cases in ./tests/misc.nix. - */ + /** + Generate an INI-style config file from an + attrset of sections to an attrset of key-value pairs. + + # Inputs + + Structured function argument + + : mkSectionName (optional, default: `(name: escape [ "[" "]" ] name)`) + : apply transformations (e.g. escapes) to section names + + : mkKeyValue (optional, default: `{} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + # Examples + :::{.example} + ## `lib.generators.toINI` usage example + + ```nix + generators.toINI {} { + foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + baz = { "also, integers" = 42; }; + } + + > [baz] + > also, integers=42 + > + > [foo] + > ciao=bar + > hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + ``` + + The mk* configuration attributes can generically change + the way sections and key-value strings are generated. + + For more examples see the test cases in ./tests/misc.nix. + + ::: + */ toINI = { - # apply transformations (e.g. escapes) to section names mkSectionName ? (name: escape [ "[" "]" ] name), - # format a setting line from key and value mkKeyValue ? mkKeyValueDefault {} "=", - # allow lists as values for duplicate keys listsAsDuplicateKeys ? false }: attrsOfAttrs: let @@ -174,43 +241,70 @@ let # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; - /* Generate an INI-style config file from an attrset - * specifying the global section (no header), and an - * attrset of sections to an attrset of key-value pairs. - * - * generators.toINIWithGlobalSection {} { - * globalSection = { - * someGlobalKey = "hi"; - * }; - * sections = { - * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; - * baz = { "also, integers" = 42; }; - * } - * - *> someGlobalKey=hi - *> - *> [baz] - *> also, integers=42 - *> - *> [foo] - *> ciao=bar - *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 - * - * The mk* configuration attributes can generically change - * the way sections and key-value strings are generated. - * - * For more examples see the test cases in ./tests/misc.nix. - * - * If you don’t need a global section, you can also use - * `generators.toINI` directly, which only takes - * the part in `sections`. - */ + /** + Generate an INI-style config file from an attrset + specifying the global section (no header), and an + attrset of sections to an attrset of key-value pairs. + + # Inputs + + 1\. Structured function argument + + : mkSectionName (optional, default: `(name: escape [ "[" "]" ] name)`) + : apply transformations (e.g. escapes) to section names + + : mkKeyValue (optional, default: `{} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + 2\. Structured function argument + + : globalSection (required) + : global section key-value pairs + + : sections (optional, default: `{}`) + : attrset of sections to key-value pairs + + # Examples + :::{.example} + ## `lib.generators.toINIWithGlobalSection` usage example + + ```nix + generators.toINIWithGlobalSection {} { + globalSection = { + someGlobalKey = "hi"; + }; + sections = { + foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + baz = { "also, integers" = 42; }; + } + + > someGlobalKey=hi + > + > [baz] + > also, integers=42 + > + > [foo] + > ciao=bar + > hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + ``` + + The mk* configuration attributes can generically change + the way sections and key-value strings are generated. + + For more examples see the test cases in ./tests/misc.nix. + + ::: + + If you don’t need a global section, you can also use + `generators.toINI` directly, which only takes + the part in `sections`. + */ toINIWithGlobalSection = { - # apply transformations (e.g. escapes) to section names mkSectionName ? (name: escape [ "[" "]" ] name), - # format a setting line from key and value mkKeyValue ? mkKeyValueDefault {} "=", - # allow lists as values for duplicate keys listsAsDuplicateKeys ? false }: { globalSection, sections ? {} }: ( if globalSection == {} @@ -219,24 +313,43 @@ let + "\n") + (toINI { inherit mkSectionName mkKeyValue listsAsDuplicateKeys; } sections); - /* Generate a git-config file from an attrset. - * - * It has two major differences from the regular INI format: - * - * 1. values are indented with tabs - * 2. sections can have sub-sections - * - * generators.toGitINI { - * url."ssh://git@github.com/".insteadOf = "https://github.com"; - * user.name = "edolstra"; - * } - * - *> [url "ssh://git@github.com/"] - *> insteadOf = "https://github.com" - *> - *> [user] - *> name = "edolstra" - */ + /** + Generate a git-config file from an attrset. + + It has two major differences from the regular INI format: + + 1. values are indented with tabs + 2. sections can have sub-sections + + Further: https://git-scm.com/docs/git-config#EXAMPLES + + # Examples + :::{.example} + ## `lib.generators.toGitINI` usage example + + ```nix + generators.toGitINI { + url."ssh://git@github.com/".insteadOf = "https://github.com"; + user.name = "edolstra"; + } + + > [url "ssh://git@github.com/"] + > insteadOf = "https://github.com" + > + > [user] + > name = "edolstra" + ``` + + ::: + + # Inputs + + `attrs` + + : Key-value pairs to be converted to a git-config file. + See: https://git-scm.com/docs/git-config#_variables for possible values. + + */ toGitINI = attrs: let mkSectionName = name: @@ -280,20 +393,40 @@ let in toINI_ (gitFlattenAttrs attrs); - # mkKeyValueDefault wrapper that handles dconf INI quirks. - # The main differences of the format is that it requires strings to be quoted. + /** + mkKeyValueDefault wrapper that handles dconf INI quirks. + The main differences of the format is that it requires strings to be quoted. + */ mkDconfKeyValue = mkKeyValueDefault { mkValueString = v: toString (gvariant.mkValue v); } "="; - # Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en - # for details. + /** + Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en + for details. + */ toDconfINI = toINI { mkKeyValue = mkDconfKeyValue; }; + /** + Recurses through a `Value` limited to a certain depth. (`depthLimit`) + + If the depth is exceeded, an error is thrown, unless `throwOnDepthLimit` is set to `false`. + + # Inputs + + Structured function argument + + : depthLimit (required) + : If this option is not null, the given value will stop evaluating at a certain depth + + : throwOnDepthLimit (optional, default: `true`) + : If this option is true, an error will be thrown, if a certain given depth is exceeded + + Value + : The value to be evaluated recursively + */ withRecursion = { - /* If this option is not null, the given value will stop evaluating at a certain depth */ - depthLimit - /* If this option is true, an error will be thrown, if a certain given depth is exceeded */ - , throwOnDepthLimit ? true + depthLimit, + throwOnDepthLimit ? true }: assert isInt depthLimit; let @@ -323,20 +456,33 @@ let in mapAny 0; - /* Pretty print a value, akin to `builtins.trace`. - * Should probably be a builtin as well. - * The pretty-printed string should be suitable for rendering default values - * in the NixOS manual. In particular, it should be as close to a valid Nix expression - * as possible. - */ + /** + Pretty print a value, akin to `builtins.trace`. + + Should probably be a builtin as well. + + The pretty-printed string should be suitable for rendering default values + in the NixOS manual. In particular, it should be as close to a valid Nix expression + as possible. + + # Inputs + + Structured function argument + : allowPrettyValues + : If this option is true, attrsets like { __pretty = fn; val = …; } + will use fn to convert val to a pretty printed representation. + (This means fn is type Val -> String.) + : multiline + : If this option is true, the output is indented with newlines for attribute sets and lists + : indent + : Initial indentation level + + Value + : The value to be pretty printed + */ toPretty = { - /* If this option is true, attrsets like { __pretty = fn; val = …; } - will use fn to convert val to a pretty printed representation. - (This means fn is type Val -> String.) */ allowPrettyValues ? false, - /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true, - /* Initial indentation level */ indent ? "" }: let @@ -397,7 +543,17 @@ let else abort "generators.toPretty: should never happen (v = ${v})"; in go indent; - # PLIST handling + /** + Translate a simple Nix expression to [Plist notation](https://en.wikipedia.org/wiki/Property_list). + + # Inputs + + Options + : Empty set, there may be configuration options in the future + + Value + : The value to be converted to Plist + */ toPlist = {}: v: let expr = ind: x: if x == null then "" else @@ -447,9 +603,21 @@ let ${expr "" v} ''; - /* Translate a simple Nix expression to Dhall notation. - * Note that integers are translated to Integer and never - * the Natural type. + /** + Translate a simple Nix expression to Dhall notation. + + Note that integers are translated to Integer and never + the Natural type. + + # Inputs + + Options + + : Empty set, there may be configuration options in the future + + Value + + : The value to be converted to Dhall */ toDhall = { }@args: v: let concatItems = concatStringsSep ", "; @@ -471,46 +639,71 @@ ${expr "" v} else toJSON v; - /* - Translate a simple Nix expression to Lua representation with occasional - Lua-inlines that can be constructed by mkLuaInline function. + /** + Translate a simple Nix expression to Lua representation with occasional + Lua-inlines that can be constructed by mkLuaInline function. - Configuration: - * multiline - by default is true which results in indented block-like view. - * indent - initial indent. - * asBindings - by default generate single value, but with this use attrset to set global vars. + Configuration: - Attention: - Regardless of multiline parameter there is no trailing newline. + * multiline - by default is true which results in indented block-like view. + * indent - initial indent. + * asBindings - by default generate single value, but with this use attrset to set global vars. - Example: - generators.toLua {} - { - cmd = [ "typescript-language-server" "--stdio" ]; - settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)''; - } - -> + Attention: + + Regardless of multiline parameter there is no trailing newline. + + + # Inputs + + Structured function argument + + : multiline (optional, default: `true`) + : If this option is true, the output is indented with newlines for attribute sets and lists + : indent (optional, default: `""`) + : Initial indentation level + : asBindings (optional, default: `false`) + : Interpret as variable bindings + + Value + + : The value to be converted to Lua + + # Type + + ``` + toLua :: AttrSet -> Any -> String + ``` + + # Examples + :::{.example} + ## `lib.generators.toLua` usage example + + ```nix + generators.toLua {} { - ["cmd"] = { - "typescript-language-server", - "--stdio" - }, - ["settings"] = { - ["workspace"] = { - ["library"] = (vim.api.nvim_get_runtime_file("", true)) - } - } + cmd = [ "typescript-language-server" "--stdio" ]; + settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)''; } + -> + { + ["cmd"] = { + "typescript-language-server", + "--stdio" + }, + ["settings"] = { + ["workspace"] = { + ["library"] = (vim.api.nvim_get_runtime_file("", true)) + } + } + } + ``` - Type: - toLua :: AttrSet -> Any -> String + ::: */ toLua = { - /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true, - /* Initial indentation level */ indent ? "", - /* Interpret as variable bindings */ asBindings ? false, }@args: v: let @@ -559,44 +752,55 @@ ${expr "" v} else abort "generators.toLua: type ${typeOf v} is unsupported"; - /* - Mark string as Lua expression to be inlined when processed by toLua. + /** + Mark string as Lua expression to be inlined when processed by toLua. - Type: - mkLuaInline :: String -> AttrSet + + # Inputs + + `expr` + + : 1\. Function argument + + # Type + + ``` + mkLuaInline :: String -> AttrSet + ``` */ mkLuaInline = expr: { _type = "lua-inline"; inherit expr; }; +} // { + /** + Generates JSON from an arbitrary (non-function) value. + For more information see the documentation of the builtin. -in + # Inputs -# Everything in this attrset is the public interface of the file. -{ - inherit - mkDconfKeyValue - mkKeyValueDefault - mkLuaInline - mkValueStringDefault - toDconfINI - toDhall - toGitINI - toINI - toINIWithGlobalSection - toKeyValue - toLua - toPlist - toPretty - withRecursion - ; + Options - /* Generates JSON from an arbitrary (non-function) value. - * For more information see the documentation of the builtin. - */ - toJSON = {}: toJSON; + : Empty set, there may be configuration options in the future - /* YAML has been a strict superset of JSON since 1.2, so we - * use toJSON. Before it only had a few differences referring - * to implicit typing rules, so it should work with older - * parsers as well. - */ - toYAML = {}: toJSON; + Value + + : The value to be converted to JSON + */ + toJSON = {}: lib.strings.toJSON; + + /** + YAML has been a strict superset of JSON since 1.2, so we + use toJSON. Before it only had a few differences referring + to implicit typing rules, so it should work with older + parsers as well. + + # Inputs + + Options + + : Empty set, there may be configuration options in the future + + Value + + : The value to be converted to YAML + */ + toYAML = {}: lib.strings.toJSON; } diff --git a/third_party/nixpkgs/lib/gvariant.nix b/third_party/nixpkgs/lib/gvariant.nix index 54aa4ea805..d542df4d7b 100644 --- a/third_party/nixpkgs/lib/gvariant.nix +++ b/third_party/nixpkgs/lib/gvariant.nix @@ -1,4 +1,4 @@ -/* +/** A partial and basic implementation of GVariant formatted strings. See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details. @@ -41,17 +41,28 @@ let variant = "v"; }; - /* Check if a value is a GVariant value - - Type: - isGVariant :: Any -> Bool - */ - isGVariant = v: v._type or "" == "gvariant"; - in rec { - inherit type isGVariant; + inherit type; + + /** + Check if a value is a GVariant value + + + # Inputs + + `v` + + : value to check + + # Type + + ``` + isGVariant :: Any -> Bool + ``` + */ + isGVariant = v: v._type or "" == "gvariant"; intConstructors = [ { @@ -100,11 +111,22 @@ rec { } ]; - /* Returns the GVariant value that most closely matches the given Nix value. - If no GVariant value can be found unambiguously then error is thrown. + /** + Returns the GVariant value that most closely matches the given Nix value. + If no GVariant value can be found unambiguously then error is thrown. - Type: - mkValue :: Any -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkValue :: Any -> gvariant + ``` */ mkValue = v: if builtins.isBool v then @@ -132,14 +154,32 @@ rec { else throw "The GVariant type of “${builtins.typeOf v}” can't be inferred."; - /* Returns the GVariant array from the given type of the elements and a Nix list. + /** + Returns the GVariant array from the given type of the elements and a Nix list. - Type: - mkArray :: [Any] -> gvariant - Example: - # Creating a string array - lib.gvariant.mkArray [ "a" "b" "c" ] + # Inputs + + `elems` + + : 1\. Function argument + + # Type + + ``` + mkArray :: [Any] -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkArray` usage example + + ```nix + # Creating a string array + lib.gvariant.mkArray [ "a" "b" "c" ] + ``` + + ::: */ mkArray = elems: let @@ -153,31 +193,67 @@ rec { "@${self.type} [${concatMapStringsSep "," toString self.value}]"; }; - /* Returns the GVariant array from the given empty Nix list. + /** + Returns the GVariant array from the given empty Nix list. - Type: - mkEmptyArray :: gvariant.type -> gvariant - Example: - # Creating an empty string array - lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + # Inputs + + `elemType` + + : 1\. Function argument + + # Type + + ``` + mkEmptyArray :: gvariant.type -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkEmptyArray` usage example + + ```nix + # Creating an empty string array + lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + ``` + + ::: */ mkEmptyArray = elemType: mkPrimitive (type.arrayOf elemType) [ ] // { __toString = self: "@${self.type} []"; }; - /* Returns the GVariant variant from the given Nix value. Variants are containers - of different GVariant type. + /** + Returns the GVariant variant from the given Nix value. Variants are containers + of different GVariant type. - Type: - mkVariant :: Any -> gvariant - Example: - lib.gvariant.mkArray [ - (lib.gvariant.mkVariant "a string") - (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) - ] + # Inputs + + `elem` + + : 1\. Function argument + + # Type + + ``` + mkVariant :: Any -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkVariant` usage example + + ```nix + lib.gvariant.mkArray [ + (lib.gvariant.mkVariant "a string") + (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) + ] + ``` + + ::: */ mkVariant = elem: let gvarElem = mkValue elem; @@ -185,23 +261,43 @@ rec { __toString = self: "<${toString self.value}>"; }; - /* Returns the GVariant dictionary entry from the given key and value. + /** + Returns the GVariant dictionary entry from the given key and value. - Type: - mkDictionaryEntry :: String -> Any -> gvariant - Example: - # A dictionary describing an Epiphany’s search provider - [ - (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) - (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) - (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) - ] + # Inputs + + `name` + + : The key of the entry + + `value` + + : The value of the entry + + # Type + + ``` + mkDictionaryEntry :: String -> Any -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkDictionaryEntry` usage example + + ```nix + # A dictionary describing an Epiphany’s search provider + [ + (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) + (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) + (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) + ] + ``` + + ::: */ mkDictionaryEntry = - # The key of the entry name: - # The value of the entry value: let name' = mkValue name; @@ -212,10 +308,25 @@ rec { __toString = self: "@${self.type} {${name'},${value'}}"; }; - /* Returns the GVariant maybe from the given element type. + /** + Returns the GVariant maybe from the given element type. - Type: - mkMaybe :: gvariant.type -> Any -> gvariant + + # Inputs + + `elemType` + + : 1\. Function argument + + `elem` + + : 2\. Function argument + + # Type + + ``` + mkMaybe :: gvariant.type -> Any -> gvariant + ``` */ mkMaybe = elemType: elem: mkPrimitive (type.maybeOf elemType) elem // { @@ -226,24 +337,57 @@ rec { "just ${toString self.value}"; }; - /* Returns the GVariant nothing from the given element type. + /** + Returns the GVariant nothing from the given element type. - Type: - mkNothing :: gvariant.type -> gvariant + + # Inputs + + `elemType` + + : 1\. Function argument + + # Type + + ``` + mkNothing :: gvariant.type -> gvariant + ``` */ mkNothing = elemType: mkMaybe elemType null; - /* Returns the GVariant just from the given Nix value. + /** + Returns the GVariant just from the given Nix value. - Type: - mkJust :: Any -> gvariant + + # Inputs + + `elem` + + : 1\. Function argument + + # Type + + ``` + mkJust :: Any -> gvariant + ``` */ mkJust = elem: let gvarElem = mkValue elem; in mkMaybe gvarElem.type gvarElem; - /* Returns the GVariant tuple from the given Nix list. + /** + Returns the GVariant tuple from the given Nix list. - Type: - mkTuple :: [Any] -> gvariant + + # Inputs + + `elems` + + : 1\. Function argument + + # Type + + ``` + mkTuple :: [Any] -> gvariant + ``` */ mkTuple = elems: let @@ -255,20 +399,42 @@ rec { "@${self.type} (${concatMapStringsSep "," toString self.value})"; }; - /* Returns the GVariant boolean from the given Nix bool value. + /** + Returns the GVariant boolean from the given Nix bool value. - Type: - mkBoolean :: Bool -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkBoolean :: Bool -> gvariant + ``` */ mkBoolean = v: mkPrimitive type.boolean v // { __toString = self: if self.value then "true" else "false"; }; - /* Returns the GVariant string from the given Nix string value. + /** + Returns the GVariant string from the given Nix string value. - Type: - mkString :: String -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkString :: String -> gvariant + ``` */ mkString = v: let sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s); @@ -276,72 +442,129 @@ rec { __toString = self: "'${sanitize self.value}'"; }; - /* Returns the GVariant object path from the given Nix string value. + /** + Returns the GVariant object path from the given Nix string value. - Type: - mkObjectpath :: String -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkObjectpath :: String -> gvariant + ``` */ mkObjectpath = v: mkPrimitive type.string v // { __toString = self: "objectpath '${escape [ "'" ] self.value}'"; }; - /* Returns the GVariant uchar from the given Nix int value. + /** + Returns the GVariant uchar from the given Nix int value. - Type: - mkUchar :: Int -> gvariant + # Type + + ``` + mkUchar :: Int -> gvariant + ``` */ mkUchar = mkPrimitive type.uchar; - /* Returns the GVariant int16 from the given Nix int value. + /** + Returns the GVariant int16 from the given Nix int value. - Type: - mkInt16 :: Int -> gvariant + # Type + + ``` + mkInt16 :: Int -> gvariant + ``` */ mkInt16 = mkPrimitive type.int16; - /* Returns the GVariant uint16 from the given Nix int value. + /** + Returns the GVariant uint16 from the given Nix int value. - Type: - mkUint16 :: Int -> gvariant + # Type + + ``` + mkUint16 :: Int -> gvariant + ``` */ mkUint16 = mkPrimitive type.uint16; - /* Returns the GVariant int32 from the given Nix int value. + /** + Returns the GVariant int32 from the given Nix int value. - Type: - mkInt32 :: Int -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkInt32 :: Int -> gvariant + ``` */ mkInt32 = v: mkPrimitive type.int32 v // { __toString = self: toString self.value; }; - /* Returns the GVariant uint32 from the given Nix int value. + /** + Returns the GVariant uint32 from the given Nix int value. - Type: - mkUint32 :: Int -> gvariant + # Type + + ``` + mkUint32 :: Int -> gvariant + ``` */ mkUint32 = mkPrimitive type.uint32; - /* Returns the GVariant int64 from the given Nix int value. + /** + Returns the GVariant int64 from the given Nix int value. - Type: - mkInt64 :: Int -> gvariant + # Type + + ``` + mkInt64 :: Int -> gvariant + ``` */ mkInt64 = mkPrimitive type.int64; - /* Returns the GVariant uint64 from the given Nix int value. + /** + Returns the GVariant uint64 from the given Nix int value. - Type: - mkUint64 :: Int -> gvariant + # Type + + ``` + mkUint64 :: Int -> gvariant + ``` */ mkUint64 = mkPrimitive type.uint64; - /* Returns the GVariant double from the given Nix float value. + /** + Returns the GVariant double from the given Nix float value. - Type: - mkDouble :: Float -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkDouble :: Float -> gvariant + ``` */ mkDouble = v: mkPrimitive type.double v // { diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix index 9a97afb1aa..8fa93d40d5 100644 --- a/third_party/nixpkgs/lib/meta.nix +++ b/third_party/nixpkgs/lib/meta.nix @@ -1,5 +1,7 @@ -/* Some functions for manipulating meta attributes, as well as the - name attribute. */ +/** + Some functions for manipulating meta attributes, as well as the + name attribute. +*/ { lib }: @@ -11,90 +13,225 @@ in rec { - /* Add to or override the meta attributes of the given - derivation. + /** + Add to or override the meta attributes of the given + derivation. - Example: - addMetaAttrs {description = "Bla blah";} somePkg + # Inputs + + `newAttrs` + + : 1\. Function argument + + `drv` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.addMetaAttrs` usage example + + ```nix + addMetaAttrs {description = "Bla blah";} somePkg + ``` + + ::: */ addMetaAttrs = newAttrs: drv: drv // { meta = (drv.meta or {}) // newAttrs; }; - /* Disable Hydra builds of given derivation. + /** + Disable Hydra builds of given derivation. + + # Inputs + + `drv` + + : 1\. Function argument */ dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv; - /* - Change the [symbolic name of a derivation](https://nixos.org/manual/nix/stable/language/derivations.html#attr-name). + /** + Change the [symbolic name of a derivation](https://nixos.org/manual/nix/stable/language/derivations.html#attr-name). - :::{.warning} - Dependent derivations will be rebuilt when the symbolic name is changed. - ::: + :::{.warning} + Dependent derivations will be rebuilt when the symbolic name is changed. + ::: + + # Inputs + + `name` + + : 1\. Function argument + + `drv` + + : 2\. Function argument */ setName = name: drv: drv // {inherit name;}; - /* Like `setName`, but takes the previous name as an argument. + /** + Like `setName`, but takes the previous name as an argument. - Example: - updateName (oldName: oldName + "-experimental") somePkg + # Inputs + + `updater` + + : 1\. Function argument + + `drv` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.updateName` usage example + + ```nix + updateName (oldName: oldName + "-experimental") somePkg + ``` + + ::: */ updateName = updater: drv: drv // {name = updater (drv.name);}; - /* Append a suffix to the name of a package (before the version - part). */ + /** + Append a suffix to the name of a package (before the version + part). + + # Inputs + + `suffix` + + : 1\. Function argument + */ appendToName = suffix: updateName (name: let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}"); - /* Apply a function to each derivation and only to derivations in an attrset. + /** + Apply a function to each derivation and only to derivations in an attrset. + + + # Inputs + + `f` + + : 1\. Function argument + + `set` + + : 2\. Function argument */ mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set; - /* Set the nix-env priority of the package. + /** + Set the nix-env priority of the package. + + # Inputs + + `priority` + : 1\. Function argument + + `drv` + : 2\. Function argument */ setPrio = priority: addMetaAttrs { inherit priority; }; - /* Decrease the nix-env priority of the package, i.e., other - versions/variants of the package will be preferred. + /** + Decrease the nix-env priority of the package, i.e., other + versions/variants of the package will be preferred. + + # Inputs + + `drv` + + : 1\. Function argument + */ lowPrio = setPrio 10; - /* Apply lowPrio to an attrset with derivations + /** + Apply lowPrio to an attrset with derivations + + + # Inputs + + `set` + + : 1\. Function argument */ lowPrioSet = set: mapDerivationAttrset lowPrio set; - /* Increase the nix-env priority of the package, i.e., this - version/variant of the package will be preferred. + /** + Increase the nix-env priority of the package, i.e., this + version/variant of the package will be preferred. + + # Inputs + + `drv` + + : 1\. Function argument */ hiPrio = setPrio (-10); - /* Apply hiPrio to an attrset with derivations + /** + Apply hiPrio to an attrset with derivations + + + # Inputs + + `set` + + : 1\. Function argument */ hiPrioSet = set: mapDerivationAttrset hiPrio set; - /* Check to see if a platform is matched by the given `meta.platforms` - element. + /** + Check to see if a platform is matched by the given `meta.platforms` + element. - A `meta.platform` pattern is either + A `meta.platform` pattern is either - 1. (legacy) a system string. + 1. (legacy) a system string. - 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). + 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). - 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). + 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). - We can inject these into a pattern for the whole of a structured platform, - and then match that. + We can inject these into a pattern for the whole of a structured platform, + and then match that. - Example: - lib.meta.platformMatch { system = "aarch64-darwin"; } "aarch64-darwin" - => true + + # Inputs + + `platform` + + : 1\. Function argument + + `elem` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.platformMatch` usage example + + ```nix + lib.meta.platformMatch { system = "aarch64-darwin"; } "aarch64-darwin" + => true + ``` + + ::: */ platformMatch = platform: elem: ( # Check with simple string comparison if elem was a string. @@ -112,39 +249,70 @@ rec { ) platform ); - /* Check if a package is available on a given platform. + /** + Check if a package is available on a given platform. - A package is available on a platform if both + A package is available on a platform if both - 1. One of `meta.platforms` pattern matches the given - platform, or `meta.platforms` is not present. + 1. One of `meta.platforms` pattern matches the given + platform, or `meta.platforms` is not present. - 2. None of `meta.badPlatforms` pattern matches the given platform. + 2. None of `meta.badPlatforms` pattern matches the given platform. - Example: - lib.meta.availableOn { system = "aarch64-darwin"; } pkg.zsh - => true + + # Inputs + + `platform` + + : 1\. Function argument + + `pkg` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.availableOn` usage example + + ```nix + lib.meta.availableOn { system = "aarch64-darwin"; } pkg.zsh + => true + ``` + + ::: */ availableOn = platform: pkg: ((!pkg?meta.platforms) || any (platformMatch platform) pkg.meta.platforms) && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []); - /* Get the corresponding attribute in lib.licenses - from the SPDX ID. - For SPDX IDs, see - https://spdx.org/licenses + /** + Get the corresponding attribute in lib.licenses + from the SPDX ID. + For SPDX IDs, see + https://spdx.org/licenses - Type: - getLicenseFromSpdxId :: str -> AttrSet + # Type - Example: - lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit - => true - lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit - => true - lib.getLicenseFromSpdxId "MY LICENSE" - => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE - => { shortName = "MY LICENSE"; } + ``` + getLicenseFromSpdxId :: str -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.meta.getLicenseFromSpdxId` usage example + + ```nix + lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "MY LICENSE" + => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE + => { shortName = "MY LICENSE"; } + ``` + + ::: */ getLicenseFromSpdxId = let @@ -156,15 +324,34 @@ rec { { shortName = licstr; } ); - /* Get the path to the main program of a package based on meta.mainProgram + /** + Get the path to the main program of a package based on meta.mainProgram - Type: getExe :: package -> string - Example: - getExe pkgs.hello - => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" - getExe pkgs.mustache-go - => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache" + # Inputs + + `x` + + : 1\. Function argument + + # Type + + ``` + getExe :: package -> string + ``` + + # Examples + :::{.example} + ## `lib.meta.getExe` usage example + + ```nix + getExe pkgs.hello + => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" + getExe pkgs.mustache-go + => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache" + ``` + + ::: */ getExe = x: getExe' x (x.meta.mainProgram or ( # This could be turned into an error when 23.05 is at end of life @@ -173,14 +360,38 @@ rec { x )); - /* Get the path of a program of a derivation. + /** + Get the path of a program of a derivation. - Type: getExe' :: derivation -> string -> string - Example: - getExe' pkgs.hello "hello" - => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" - getExe' pkgs.imagemagick "convert" - => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" + + # Inputs + + `x` + + : 1\. Function argument + + `y` + + : 2\. Function argument + + # Type + + ``` + getExe' :: derivation -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.meta.getExe'` usage example + + ```nix + getExe' pkgs.hello "hello" + => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" + getExe' pkgs.imagemagick "convert" + => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" + ``` + + ::: */ getExe' = x: y: assert assertMsg (isDerivation x) diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 7e64e6e510..f4d0d9d36c 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -220,10 +220,10 @@ rec { (if isList example then "${pkgsText}." + concatStringsSep "." example else example); }); - /* Alias of mkPackageOption. Previously used to create options with markdown - documentation, which is no longer required. + /* Deprecated alias of mkPackageOption, to be removed in 25.05. + Previously used to create options with markdown documentation, which is no longer required. */ - mkPackageOptionMD = mkPackageOption; + mkPackageOptionMD = lib.warn "mkPackageOptionMD is deprecated and will be removed in 25.05; please use mkPackageOption." mkPackageOption; /* This option accepts anything, but it does not produce any result. diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index 0981122388..074239b3fb 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -84,20 +84,21 @@ let useLLVM = final.isFreeBSD || final.isOpenBSD; libc = - /**/ if final.isDarwin then "libSystem" - else if final.isMinGW then "msvcrt" - else if final.isWasi then "wasilibc" - else if final.isRedox then "relibc" - else if final.isMusl then "musl" - else if final.isUClibc then "uclibc" - else if final.isAndroid then "bionic" - else if final.isLinux /* default */ then "glibc" - else if final.isFreeBSD then "fblibc" - else if final.isOpenBSD then "oblibc" - else if final.isNetBSD then "nblibc" - else if final.isAvr then "avrlibc" - else if final.isGhcjs then null - else if final.isNone then "newlib" + /**/ if final.isDarwin then "libSystem" + else if final.isMinGW then "msvcrt" + else if final.isWasi then "wasilibc" + else if final.isWasm && !final.isWasi then null + else if final.isRedox then "relibc" + else if final.isMusl then "musl" + else if final.isUClibc then "uclibc" + else if final.isAndroid then "bionic" + else if final.isLinux /* default */ then "glibc" + else if final.isFreeBSD then "fblibc" + else if final.isOpenBSD then "oblibc" + else if final.isNetBSD then "nblibc" + else if final.isAvr then "avrlibc" + else if final.isGhcjs then null + else if final.isNone then "newlib" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; # Choose what linker we wish to use by default. Someday we might also @@ -179,6 +180,7 @@ let (isAndroid || isGnu || isMusl # Linux (allows multiple libcs) || isDarwin || isSunOS || isOpenBSD || isFreeBSD || isNetBSD # BSDs || isCygwin || isMinGW # Windows + || isWasm # WASM ) && !isStatic; # The difference between `isStatic` and `hasSharedLibraries` is mainly the @@ -187,7 +189,7 @@ let # don't support dynamic linking, but don't get the `staticMarker`. # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always # has the `staticMarker`. - isStatic = final.isWasm || final.isRedox; + isStatic = final.isWasi || final.isRedox; # Just a guess, based on `system` inherit @@ -337,7 +339,8 @@ let if isList f then f else [ f ] ) else optional final.isUnix "unix" - ++ optional final.isWindows "windows"; + ++ optional final.isWindows "windows" + ++ optional final.isWasm "wasm"; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor vendor = let diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index 7e50266748..178536efb0 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -356,6 +356,12 @@ rec { useLLVM = true; }; + wasm32-unknown-none = { + config = "wasm32-unknown-none"; + rust.rustcTarget = "wasm32-unknown-unknown"; + useLLVM = true; + }; + # Ghcjs ghcjs = { # This triple is special to GHC/Cabal/GHCJS and not recognized by autotools diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix index 1d7c95943a..a2ee288f2c 100644 --- a/third_party/nixpkgs/lib/systems/parse.nix +++ b/third_party/nixpkgs/lib/systems/parse.nix @@ -466,11 +466,12 @@ rec { } # cpu-vendor-os else if elemAt l 1 == "apple" || - elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ] || + elem (elemAt l 2) [ "redox" "mmixware" "ghcjs" "mingw32" ] || hasPrefix "freebsd" (elemAt l 2) || hasPrefix "netbsd" (elemAt l 2) || hasPrefix "openbsd" (elemAt l 2) || - hasPrefix "genode" (elemAt l 2) + hasPrefix "genode" (elemAt l 2) || + hasPrefix "wasm32" (elemAt l 0) then { cpu = elemAt l 0; vendor = elemAt l 1; diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index 20a3ffebbc..546aed746d 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -379,7 +379,7 @@ in { */ oldestSupportedRelease = # Update on master only. Do not backport. - 2311; + 2405; /** Whether a feature is supported in all supported releases (at the time of diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index c360cac044..165fb180f6 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -97,6 +97,12 @@ githubId = 9675338; keys = [ { fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; } ]; }; + _0x5a4 = { + email = "bej86nug@hhu.de"; + name = "0x5a4"; + github = "0x5a4"; + githubId = 54070204; + }; _0xB10C = { email = "nixpkgs@b10c.me"; name = "0xB10C"; @@ -640,7 +646,7 @@ name = "Alexander Hirner"; }; ahoneybun = { - email = "aaron@system76.com"; + email = "aaronhoneycutt@proton.me"; github = "ahoneybun"; githubId = 4884946; name = "Aaron Honeycutt"; @@ -1048,13 +1054,6 @@ githubId = 169249; name = "Alex Brandt"; }; - alva = { - email = "alva@skogen.is"; - github = "illfygli"; - githubId = 42881386; - name = "Alva"; - keys = [ { fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; } ]; - }; alxsimon = { email = "alexis.simon@normalesup.org"; github = "alxsimon"; @@ -1160,6 +1159,11 @@ githubId = 858965; name = "Andrew Morsillo"; }; + amozeo = { + email = "wroclaw223@outlook.com"; + githubId = 37040543; + name = "Wroclaw"; + }; amyipdev = { email = "amy@amyip.net"; github = "amyipdev"; @@ -2665,6 +2669,12 @@ githubId = 37907; name = "Julian Stecklina"; }; + bloeckchengrafik = { + email = "christian.bergschneider@gmx.de"; + github = "Bloeckchengrafik"; + githubId = 37768199; + name = "Christian Bergschneider"; + }; bloveless = { email = "brennon.loveless@gmail.com"; github = "bloveless"; @@ -4342,6 +4352,12 @@ githubId = 24708079; name = "Dan Eads"; }; + danielalvsaaker = { + email = "daniel.alvsaaker@proton.me"; + github = "danielalvsaaker"; + githubId = 30574112; + name = "Daniel Alvsåker"; + }; danielbarter = { email = "danielbarter@gmail.com"; github = "danielbarter"; @@ -5879,6 +5895,13 @@ githubId = 13485450; name = "Emmanuel Rosa"; }; + emneo = { + name = "emneo"; + email = "emneo@kreog.com"; + github = "emneo-dev"; + githubId = 44233177; + keys = [ { fingerprint = "5FD0 400D 0E78 EAF9 8431 4880 8EBF C4B9 24C6 2D20"; } ]; + }; emptyflask = { email = "jon@emptyflask.dev"; github = "emptyflask"; @@ -6636,6 +6659,12 @@ githubId = 1109959; name = "Florian Jacob"; }; + floriansanderscc = { + email = "florian.sanders+nixos@clever-cloud.com"; + github = "florian-sanders-cc"; + githubId = 100240294; + name = "Florian Sanders"; + }; flosse = { email = "mail@markus-kohlhase.de"; github = "flosse"; @@ -8395,6 +8424,12 @@ email = "astrid@astrid.tech"; name = "ifd3f"; }; + if-loop69420 = { + github = "if-loop69420"; + githubId = 81078181; + email = "j.sztavi@pm.me"; + name = "Jeremy Sztavinovszki"; + }; iFreilicht = { github = "iFreilicht"; githubId = 9742635; @@ -8740,12 +8775,6 @@ githubId = 650601; name = "Ivan Tkatchev"; }; - ivar = { - email = "ivar.scholten@protonmail.com"; - github = "IvarWithoutBones"; - githubId = 41924494; - name = "Ivar"; - }; ivarmedi = { email = "ivar@larsson.me"; github = "ivarmedi"; @@ -8959,6 +8988,11 @@ githubId = 3874017; name = "Jappie Klooster"; }; + jaredmontoya = { + name = "Jared Montoya"; + github = "jaredmontoya"; + githubId = 49511278; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -9757,13 +9791,6 @@ github = "jonochang"; githubId = 13179; }; - jonringer = { - email = "jonringer117@gmail.com"; - matrix = "@jonringer:matrix.org"; - github = "jonringer"; - githubId = 7673602; - name = "Jonathan Ringer"; - }; jopejoe1 = { email = "johannes@joens.email"; matrix = "@jopejoe1:matrix.org"; @@ -10628,6 +10655,12 @@ github = "kkoniuszy"; githubId = 120419423; }; + klchen0112 = { + name = "klchen0112"; + email = "klchen0112@gmail.com"; + github = "klchen0112"; + githubId = 32459567; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -11094,12 +11127,6 @@ githubId = 621759; name = "Lassulus"; }; - laurailway = { - email = "laurailway.git@posteo.net"; - github = "LAURAilway"; - githubId = 118690640; - name = "Laura"; - }; laurent-f1z1 = { email = "laurent.nixpkgs@fainsin.bzh"; github = "Laurent2916"; @@ -11344,6 +11371,12 @@ githubId = 1769386; name = "Liam Diprose"; }; + liarokapisv = { + email = "liarokapis.v@gmail.com"; + github = "liarokapisv"; + githubId = 19633626; + name = "Alexandros Liarokapis"; + }; liassica = { email = "git-commit.jingle869@aleeas.com"; github = "Liassica"; @@ -11441,6 +11474,12 @@ githubId = 36448130; name = "Michael Brantley"; }; + linbreux = { + email = "linbreux@gmail.com"; + github = "linbreux"; + githubId = 29354411; + name = "linbreux"; + }; linc01n = { email = "git@lincoln.hk"; github = "linc01n"; @@ -12922,7 +12961,7 @@ name = "Merlin Humml"; }; mguentner = { - email = "code@klandest.in"; + email = "code@mguentner.de"; github = "mguentner"; githubId = 668926; name = "Maximilian Güntner"; @@ -12944,6 +12983,12 @@ githubId = 20536514; name = "Magdalena Haselsteiner"; }; + mi-ael = { + email = "miael.oss.1970@gmail.com"; + name = "mi-ael"; + github = "mi-ael"; + githubId = 12199265; + }; miangraham = { github = "miangraham"; githubId = 704580; @@ -13327,6 +13372,12 @@ githubId = 5698461; name = "Maciej Kazulak"; }; + mkez = { + email = "matias.zwinger+nix@protonmail.com"; + github = "mk3z"; + githubId = 52108954; + name = "Matias Zwinger"; + }; mkf = { email = "m@mikf.pl"; github = "mkf"; @@ -14193,7 +14244,7 @@ networkexception = { name = "networkException"; email = "nix@nwex.de"; - matrix = "@networkexception:chat.upi.li"; + matrix = "@networkexception:nwex.de"; github = "networkException"; githubId = 42888162; keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; } ]; @@ -19932,6 +19983,13 @@ github = "thenonameguy"; githubId = 2217181; }; + theobori = { + name = "Théo Bori"; + email = "theo1.bori@epitech.eu"; + github = "theobori"; + githubId = 71843723; + keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D A75C BDD5 7BE9 9D55 5965"; } ]; + }; therealansh = { email = "tyagiansh23@gmail.com"; github = "therealansh"; @@ -20316,6 +20374,12 @@ email = "tomaszierl@outlook.com"; name = "Tomkoid"; }; + Tommimon = { + name = "Tommaso Montanari"; + email = "sefymw7q8@mozmail.com"; + github = "Tommimon"; + githubId = 37435103; + }; tomodachi94 = { email = "tomodachi94@protonmail.com"; matrix = "@tomodachi94:matrix.org"; @@ -21951,6 +22015,12 @@ githubId = 58453832; keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ]; }; + yelite = { + name = "Lite Ye"; + email = "yelite958@gmail.com"; + github = "yelite"; + githubId = 3517225; + }; YellowOnion = { name = "Daniel Hill"; email = "daniel@gluo.nz"; diff --git a/third_party/nixpkgs/maintainers/scripts/bootstrap-files/README.md b/third_party/nixpkgs/maintainers/scripts/bootstrap-files/README.md index 7a1a2bef86..d40ab5212a 100644 --- a/third_party/nixpkgs/maintainers/scripts/bootstrap-files/README.md +++ b/third_party/nixpkgs/maintainers/scripts/bootstrap-files/README.md @@ -47,6 +47,30 @@ target: who can help you test the updated architecture and once reviewed tag `@lovesegfault` to upload the tarballs. +## How to add bootstrap files for a new target + +The procedure to add a new target is very similar to the update +procedure. The only difference is that you need to set up a new job to +build the `bootstrapFiles`. To do that you will need the following: + +1. Add your new target to `lib/systems/examples.nix` + + This will populate `pkgsCross.$target` attribute set. If you are + dealing with `bootstrapFiles` upload you probably already have it. + +2. Add your new target to + `pkgs/stdenv/linux/make-bootstrap-tools-cross.nix`. This will add a + new hydra job to `nixpkgs:cross-trunk` jobset. + +3. Wait for a hydra to build your bootstrap tarballs. + +4. Add your new target to + `maintainers/scripts/bootstrap-files/refresh-tarballs.bash` around + `CROSS_TARGETS=()`. + +5. Add your new target to `pkgs/stdenv/linux/default.nix` and follow + standard bootstrap seed update procedure above. + ## Bootstrap files job definitions There are two types of bootstrap files: diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index d4b6190f19..68e5829779 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -136,7 +136,6 @@ telescope.nvim,,,,,5.1, telescope-manix,,,,,, tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles -toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb tree-sitter-norg,,,,,5.1,mrcjkb vstruct,,,,,, diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 51b5f57548..fb88ea3fed 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -141,6 +141,13 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + clevercloud = { + members = [ floriansanderscc ]; + scope = "Maintain Clever Cloud related packages."; + shortName = "CleverCloud"; + githubTeams = [ "CleverCloud" ]; + }; + cloudposse = { members = [ dudymas ]; scope = "Maintain atmos and applications made by the Cloud Posse team."; @@ -192,7 +199,6 @@ with lib.maintainers; dotnet = { members = [ - ivar mdarocha corngood ggg @@ -380,6 +386,7 @@ with lib.maintainers; golang = { members = [ kalbasit + katexochen mic92 zowoq qbit @@ -460,7 +467,6 @@ with lib.maintainers; members = [ cleverca22 disassembler - jonringer manveru nrdxp ]; @@ -794,7 +800,6 @@ with lib.maintainers; python = { members = [ hexa - jonringer natsukium ]; scope = "Maintain the Python interpreter and related packages."; @@ -913,7 +918,6 @@ with lib.maintainers; members = [ atemu eclairevoyant - jonringer k900 mkg20001 ]; @@ -945,7 +949,6 @@ with lib.maintainers; vim = { members = [ figsoda - jonringer softinio teto ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md index 2a979a1e14..fba3d1f9c7 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md @@ -21,6 +21,10 @@ - [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). +- [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). + +- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `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: @@ -43,6 +47,8 @@ - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`. - Top-level `clang_tools_` attributes are now aliases; these will be removed in a future release. +- `buildbot` was updated to 4.0, the AngularJS frontend has been replaced by a React frontend, see the [upstream release notes](https://docs.buildbot.net/current/manual/upgrading/4.0-upgrade.html). + - `nginx` package no longer includes `gd` and `geoip` dependencies. For enabling it, override `nginx` package with the optionals `withImageFilter` and `withGeoIP`. - `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 @@ -56,6 +62,8 @@ nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `pkgs.nextcloud27` has been removed since it's EOL. + - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`, which is part of the new free-form `services.forgejo.secrets` option. `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as @@ -98,8 +106,24 @@ for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured data and the filesystem for blobs). +- 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: + + ``` + # This is how a environment file can be generated: + # $ printf "SHIORI_HTTP_SECRET_KEY=%s\n" "$(openssl rand -hex 16)" > /path/to/env-file + services.shiori.environmentFile = "/path/to/env-file"; + ``` + - `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 + ultimately remove it in GitLab 18.0, as outlined in the + [documentation](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#estimated-time-frame-for-planned-changes). + After upgrading to GitLab >= 17.0, it is possible to re-enable support for registration tokens in the UI until GitLab 18.0. + Refer to the manual on [using registration tokens after GitLab 17.0](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#using-registration-tokens-after-gitlab-170). + GitLab administrators should migrate to the [new runner registration workflow](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#using-registration-tokens-after-gitlab-170) + with *runner authentication tokens* until the release of GitLab 18.0. + - `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. @@ -112,6 +136,10 @@ services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }; ``` +- The default value of `services.kubernetes.kubelet.hostname` is now lowercased. + Explicitly set `kubelet.hostname` to `networking.fqdnOrHostName` to get back + the old default behavior. + - `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. @@ -119,6 +147,9 @@ support, which is the intended default behavior by Tracy maintainers. X11 users have to switch to the new package `tracy-x11`. +- The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained. + Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead. + ## Other Notable Changes {#sec-release-24.11-notable-changes} @@ -127,6 +158,19 @@ not the `hare` package, should be added to `nativeBuildInputs` when building Hare programs. +- [`lib.options.mkPackageOptionMD`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOptionMD) is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead. + - 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. + +- Cinnamon has been updated to 6.2. + - Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. + - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop + listed as a regular entry in Cinnamon Wayland session's window list applet. + +- 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 + {option}`services.gitlab-runner.services..authenticationTokenConfigFile` instead of the former + {option}`services.gitlab-runner.services..registrationConfigFile` option. diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 0274dfcaa7..e38050e637 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -46,8 +46,6 @@ in TRUNK_LINK_FAILURE_MODE = 0; NVSWITCH_FAILURE_MODE = 0; ABORT_CUDA_JOBS_ON_FM_EXIT = 1; - TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; - DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; }; defaultText = lib.literalExpression '' { @@ -69,8 +67,6 @@ in TRUNK_LINK_FAILURE_MODE=0; NVSWITCH_FAILURE_MODE=0; ABORT_CUDA_JOBS_ON_FM_EXIT=1; - TOPOLOGY_FILE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; - DATABASE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; } ''; description = '' @@ -628,7 +624,14 @@ in TimeoutStartSec = 240; ExecStart = let - nv-fab-conf = settingsFormat.generate "fabricmanager.conf" cfg.datacenter.settings; + # Since these rely on the `nvidia_x11.fabricmanager` derivation, they're + # unsuitable to be mentioned in the configuration defaults, but they _can_ + # be overridden in `cfg.datacenter.settings` if needed. + fabricManagerConfDefaults = { + TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; + DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; + }; + nv-fab-conf = settingsFormat.generate "fabricmanager.conf" (fabricManagerConfDefaults // cfg.datacenter.settings); in "${lib.getExe nvidia_x11.fabricmanager} -c ${nv-fab-conf}"; LimitCORE = "infinity"; diff --git a/third_party/nixpkgs/nixos/modules/image/repart-image.nix b/third_party/nixpkgs/nixos/modules/image/repart-image.nix index e404067299..de03beeafc 100644 --- a/third_party/nixpkgs/nixos/modules/image/repart-image.nix +++ b/third_party/nixpkgs/nixos/modules/image/repart-image.nix @@ -90,8 +90,8 @@ let }."${compression.algorithm}"; compressionCommand = { - "zstd" = "zstd --no-progress --threads=0 -${toString compression.level}"; - "xz" = "xz --keep --verbose --threads=0 -${toString compression.level}"; + "zstd" = "zstd --no-progress --threads=$NIX_BUILD_CORES -${toString compression.level}"; + "xz" = "xz --keep --verbose --threads=$NIX_BUILD_CORES -${toString compression.level}"; }."${compression.algorithm}"; in stdenvNoCC.mkDerivation (finalAttrs: diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 9669ec5e37..54d3a107d6 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/yrsmzlw2lgbknzwic1gy1gmv3l2w1ax8-nix-2.18.3"; - i686-linux = "/nix/store/ds9381l9mlwfaclvqnkzn3jl4qb8m3y1-nix-2.18.3"; - aarch64-linux = "/nix/store/hw1zny3f8520zyskmp1qaybv1ir5ilxh-nix-2.18.3"; - x86_64-darwin = "/nix/store/z08yc4sl1fr65q53wz6pw30h67qafaln-nix-2.18.3"; - aarch64-darwin = "/nix/store/p57m7m0wrz8sqxiwinzpwzqzak82zn75-nix-2.18.3"; + x86_64-linux = "/nix/store/1w4b47zhp33md29wjhgg549pc281vv02-nix-2.18.4"; + i686-linux = "/nix/store/hz02kn0ffn3wdi2xs7lndpr88v4v4fp2-nix-2.18.4"; + aarch64-linux = "/nix/store/90zwqa9z2fgldc7ki1p5gfvglchjh9r6-nix-2.18.4"; + x86_64-darwin = "/nix/store/bd1ix5mj9lj2yh7bqnmdjc24zlg5jivk-nix-2.18.4"; + aarch64-darwin = "/nix/store/5hvsmklhqiay5i4q5vdkg60p8qpc69rz-nix-2.18.4"; } diff --git a/third_party/nixpkgs/nixos/modules/misc/mandoc.nix b/third_party/nixpkgs/nixos/modules/misc/mandoc.nix index 706e2ac2c2..166693930b 100644 --- a/third_party/nixpkgs/nixos/modules/misc/mandoc.nix +++ b/third_party/nixpkgs/nixos/modules/misc/mandoc.nix @@ -96,12 +96,17 @@ in {option}`documentation.man.mandoc.manPath` to an empty list (`[]`). ''; }; - output.fragment = lib.mkEnableOption '' - Omit the declaration and the , , and - elements and only emit the subtree below the element in HTML - output of {manpage}`mandoc(1)`. The style argument will be ignored. - This is useful when embedding manual content within existing documents. - ''; + output.fragment = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Whether to omit the declaration and the , , and + elements and only emit the subtree below the element in HTML + output of {manpage}`mandoc(1)`. The style argument will be ignored. + This is useful when embedding manual content within existing documents. + ''; + }; output.includes = lib.mkOption { type = with lib.types; nullOr str; default = null; @@ -160,9 +165,9 @@ in ''; }; output.toc = lib.mkEnableOption '' - In HTML output of {manpage}`mandoc(1)`, If an input file contains - at least two non-standard sections, print a table of contents near - the beginning of the output. + printing a table of contents near the beginning of the HTML output + of {manpage}`mandoc(1)` if an input file contains at least two + non-standard sections ''; output.width = lib.mkOption { type = with lib.types; nullOr int; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 876e40983c..4d227916c4 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -243,6 +243,7 @@ ./programs/nh.nix ./programs/nix-index.nix ./programs/nix-ld.nix + ./programs/nix-required-mounts.nix ./programs/nm-applet.nix ./programs/nncp.nix ./programs/noisetorch.nix @@ -477,6 +478,7 @@ ./services/desktops/bamf.nix ./services/desktops/blueman.nix ./services/desktops/cpupower-gui.nix + ./services/desktops/deepin/deepin-anything.nix ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/app-services.nix ./services/desktops/deepin/dde-daemon.nix @@ -485,6 +487,7 @@ ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix + ./services/desktops/playerctld.nix ./services/desktops/gnome/at-spi2-core.nix ./services/desktops/gnome/evolution-data-server.nix ./services/desktops/gnome/glib-networking.nix @@ -1224,6 +1227,7 @@ ./services/networking/vsftpd.nix ./services/networking/wasabibackend.nix ./services/networking/websockify.nix + ./services/networking/wg-access-server.nix ./services/networking/wg-netmanager.nix ./services/networking/webhook.nix ./services/networking/wg-quick.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix b/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix index de9446ad73..c764352843 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix @@ -8,9 +8,7 @@ in { options = { programs.dublin-traceroute = { - enable = lib.mkEnableOption '' - dublin-traceroute, add it to the global environment and configure a setcap wrapper for it. - ''; + enable = lib.mkEnableOption "dublin-traceroute (including setcap wrapper)"; package = lib.mkPackageOption pkgs "dublin-traceroute" { }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix b/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix index 6cdd198a7d..c01a004781 100644 --- a/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix +++ b/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix @@ -1,7 +1,7 @@ { lib, pkgs, config, ... }: { options.programs.joycond-cemuhook = { - enable = lib.mkEnableOption "joycond-cemuhook, a program to enable support for cemuhook's UDP protocol for joycond devices."; + enable = lib.mkEnableOption "joycond-cemuhook, a program to enable support for cemuhook's UDP protocol for joycond devices"; }; config = lib.mkIf config.programs.joycond-cemuhook.enable { diff --git a/third_party/nixpkgs/nixos/modules/programs/mouse-actions.nix b/third_party/nixpkgs/nixos/modules/programs/mouse-actions.nix index fdf39d56d3..73dc783e31 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mouse-actions.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mouse-actions.nix @@ -6,7 +6,7 @@ in { options.programs.mouse-actions = { enable = lib.mkEnableOption '' - mouse-actions udev rules. This is a prerequisite for using mouse-actions without being root. + mouse-actions udev rules. This is a prerequisite for using mouse-actions without being root ''; }; config = lib.mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix b/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix new file mode 100644 index 0000000000..5d25958a76 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix @@ -0,0 +1,118 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.nix-required-mounts; + package = pkgs.nix-required-mounts; + + Mount = + with lib; + types.submodule { + options.host = mkOption { + type = types.str; + description = "Host path to mount"; + }; + options.guest = mkOption { + type = types.str; + description = "Location in the sandbox to mount the host path at"; + }; + }; + Pattern = + with lib.types; + types.submodule ( + { config, name, ... }: + { + options.onFeatures = lib.mkOption { + type = listOf types.str; + description = "Which requiredSystemFeatures should trigger relaxation of the sandbox"; + default = [ name ]; + }; + options.paths = lib.mkOption { + type = listOf (oneOf [ + path + Mount + ]); + description = "A list of glob patterns, indicating which paths to expose to the sandbox"; + }; + options.unsafeFollowSymlinks = lib.mkEnableOption '' + Instructs the hook to mount the symlink targets as well, when any of + the `paths` contain symlinks. This may not work correctly with glob + patterns. + ''; + } + ); + + driverPaths = [ + pkgs.addOpenGLRunpath.driverLink + + # mesa: + config.hardware.opengl.package + + # nvidia_x11, etc: + ] ++ config.hardware.opengl.extraPackages; # nvidia_x11 + + defaults = { + nvidia-gpu.onFeatures = package.allowedPatterns.nvidia-gpu.onFeatures; + nvidia-gpu.paths = package.allowedPatterns.nvidia-gpu.paths ++ driverPaths; + nvidia-gpu.unsafeFollowSymlinks = false; + }; +in +{ + meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; + options.programs.nix-required-mounts = { + enable = lib.mkEnableOption "Expose extra paths to the sandbox depending on derivations' requiredSystemFeatures"; + presets.nvidia-gpu.enable = lib.mkEnableOption '' + Declare the support for derivations that require an Nvidia GPU to be + available, e.g. derivations with `requiredSystemFeatures = [ "cuda" ]`. + This mounts the corresponding userspace drivers and device nodes in the + sandbox, but only for derivations that request these special features. + + You may extend or override the exposed paths via the + `programs.nix-required-mounts.allowedPatterns.nvidia-gpu.paths` option. + ''; + allowedPatterns = + with lib.types; + lib.mkOption rec { + type = attrsOf Pattern; + description = "The hook config, describing which paths to mount for which system features"; + default = { }; + defaultText = lib.literalExpression '' + { + opengl.paths = config.hardware.opengl.extraPackages ++ [ + config.hardware.opengl.package + pkgs.addOpenGLRunpath.driverLink + "/dev/dri" + ]; + } + ''; + example.require-ipfs.paths = [ "/ipfs" ]; + example.require-ipfs.onFeatures = [ "ifps" ]; + }; + extraWrapperArgs = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = "List of extra arguments (such as `--add-flags -v`) to pass to the hook's wrapper"; + }; + package = lib.mkOption { + type = lib.types.package; + default = package.override { inherit (cfg) allowedPatterns extraWrapperArgs; }; + description = "The final package with the final config applied"; + internal = true; + }; + }; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { nix.settings.pre-build-hook = lib.getExe cfg.package; } + (lib.mkIf cfg.presets.nvidia-gpu.enable { + nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; + programs.nix-required-mounts.allowedPatterns = { + inherit (defaults) nvidia-gpu; + }; + }) + ] + ); +} diff --git a/third_party/nixpkgs/nixos/modules/programs/screen.nix b/third_party/nixpkgs/nixos/modules/programs/screen.nix index 4f3cd9fcf9..63bfe6576c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/screen.nix +++ b/third_party/nixpkgs/nixos/modules/programs/screen.nix @@ -9,7 +9,7 @@ in programs.screen = { enable = lib.mkEnableOption "screen, a basic terminal multiplexer"; - package = lib.mkPackageOptionMD pkgs "screen" { }; + package = lib.mkPackageOption pkgs "screen" { }; screenrc = lib.mkOption { type = lib.types.lines; diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix index 575adc79cf..6e69c1730e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix @@ -38,12 +38,13 @@ in xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; }; systemd.setPath.enable = lib.mkEnableOption null // { - default = true; + default = lib.versionOlder cfg.package.version "0.41.2"; + defaultText = lib.literalExpression ''lib.versionOlder cfg.package.version "0.41.2"''; example = false; description = '' Set environment path of systemd to include the current system's bin directory. This is needed in Hyprland setups, where opening links in applications do not work. - Enabled by default. + Enabled by default for Hyprland versions older than 0.41.2. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/ca.nix b/third_party/nixpkgs/nixos/modules/security/ca.nix index af5d91b35f..8aae6eb3f2 100644 --- a/third_party/nixpkgs/nixos/modules/security/ca.nix +++ b/third_party/nixpkgs/nixos/modules/security/ca.nix @@ -26,13 +26,13 @@ in security.pki.useCompatibleBundle = mkEnableOption ''usage of a compatibility bundle. - Such a bundle consist exclusively of `BEGIN CERTIFICATE` and no `BEGIN TRUSTED CERTIFICATE`, - which is a OpenSSL specific PEM format. + Such a bundle consists exclusively of `BEGIN CERTIFICATE` and no `BEGIN TRUSTED CERTIFICATE`, + which is an OpenSSL specific PEM format. It is known to be incompatible with certain software stacks. Nevertheless, enabling this will strip all additional trust rules provided by the - certificates themselves, this can have security consequences depending on your usecases. + certificates themselves. This can have security consequences depending on your usecases ''; security.pki.certificateFiles = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 5d3bed2fb0..f77e819d0c 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -1055,7 +1055,7 @@ in the dp9ik pam module provided by tlsclient. If set, users can be authenticated against the 9front - authentication server given in {option}`security.pam.dp9ik.authserver`. + authentication server given in {option}`security.pam.dp9ik.authserver` ''; control = mkOption { default = "sufficient"; diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index f7ee4f0068..76f623096f 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -14,6 +14,8 @@ in security.polkit.enable = mkEnableOption "polkit"; + security.polkit.package = mkPackageOption pkgs "polkit" { }; + security.polkit.debug = mkEnableOption "debug logs from polkit. This is required in order to see log messages from rule definitions"; security.polkit.extraConfig = mkOption { @@ -57,13 +59,13 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ]; + environment.systemPackages = [ cfg.package.bin cfg.package.out ]; - systemd.packages = [ pkgs.polkit.out ]; + systemd.packages = [ cfg.package.out ]; systemd.services.polkit.serviceConfig.ExecStart = [ "" - "${pkgs.polkit.out}/lib/polkit-1/polkitd ${optionalString (!cfg.debug) "--no-debug"}" + "${cfg.package.out}/lib/polkit-1/polkitd ${optionalString (!cfg.debug) "--no-debug"}" ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; @@ -82,7 +84,7 @@ in ${cfg.extraConfig} ''; #TODO: validation on compilation (at least against typos) - services.dbus.packages = [ pkgs.polkit.out ]; + services.dbus.packages = [ cfg.package.out ]; security.pam.services.polkit-1 = {}; @@ -91,13 +93,13 @@ in { setuid = true; owner = "root"; group = "root"; - source = "${pkgs.polkit.bin}/bin/pkexec"; + source = "${cfg.package.bin}/bin/pkexec"; }; polkit-agent-helper-1 = { setuid = true; owner = "root"; group = "root"; - source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + source = "${cfg.package.out}/lib/polkit-1/polkit-agent-helper-1"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix b/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix index 6ccf42ed7f..e63a64d469 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix @@ -41,7 +41,7 @@ in enable = mkEnableOption '' a memory-safe implementation of the {command}`sudo` command, - which allows non-root users to execute commands as root. + which allows non-root users to execute commands as root ''; package = mkPackageOption pkgs "sudo-rs" { }; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix index b3dd3c7887..9c430bd05e 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix @@ -35,7 +35,7 @@ in default = 5050; }; - package = mkPackageOptionMD pkgs "pgadmin4" { }; + package = mkPackageOption pkgs "pgadmin4" { }; initialEmail = mkOption { description = "Initial email for the pgAdmin account"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index c841f4e5f1..f36edeaf64 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -356,7 +356,7 @@ in boot.kernelModules = ["br_netfilter" "overlay"]; services.kubernetes.kubelet.hostname = - mkDefault config.networking.fqdnOrHostName; + mkDefault (lib.toLower config.networking.fqdnOrHostName); services.kubernetes.pki.certs = with top.lib; { kubelet = mkCert { diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index 62c62c5d23..1771ca0b98 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,7 +1,43 @@ { config, lib, pkgs, ... }: -with builtins; -with lib; + let + inherit (builtins) + hashString + map + substring + toJSON + toString + unsafeDiscardStringContext + ; + + inherit (lib) + any + assertMsg + attrValues + concatStringsSep + escapeShellArg + filterAttrs + hasPrefix + isStorePath + literalExpression + mapAttrs' + mapAttrsToList + mkDefault + mkEnableOption + mkIf + mkOption + mkPackageOption + mkRemovedOptionModule + mkRenamedOptionModule + nameValuePair + optional + optionalAttrs + optionals + teams + toShellVar + types + ; + cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; @@ -20,17 +56,16 @@ let configPath = ''"$HOME"/.gitlab-runner/config.toml''; configureScript = pkgs.writeShellApplication { name = "gitlab-runner-configure"; - runtimeInputs = with pkgs; [ + runtimeInputs = [ cfg.package ] ++ (with pkgs; [ bash gawk jq moreutils remarshal util-linux - cfg.package perl python3 - ]; + ]); text = if (cfg.configFile != null) then '' cp ${cfg.configFile} ${configPath} # make config file readable by service @@ -84,15 +119,20 @@ let # TODO so here we should mention NEW_SERVICES if [ -v 'NEW_SERVICES["${name}"]' ] ; then bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ - "set -a && source ${service.registrationConfigFile} &&" + "set -a && source ${ + if service.registrationConfigFile != null + then service.registrationConfigFile + else service.authenticationTokenConfigFile} &&" "gitlab-runner register" "--non-interactive" "--name '${name}'" "--executor ${service.executor}" "--limit ${toString service.limit}" "--request-concurrency ${toString service.requestConcurrency}" + ] + ++ optional (service.authenticationTokenConfigFile == null) "--maximum-timeout ${toString service.maximumTimeout}" - ] ++ service.registrationFlags + ++ service.registrationFlags ++ optional (service.buildsDir != null) "--builds-dir ${service.buildsDir}" ++ optional (service.cloneUrl != null) @@ -103,11 +143,11 @@ let "--pre-build-script ${service.preBuildScript}" ++ optional (service.postBuildScript != null) "--post-build-script ${service.postBuildScript}" - ++ optional (service.tagList != [ ]) + ++ optional (service.authenticationTokenConfigFile == null && service.tagList != [ ]) "--tag-list ${concatStringsSep "," service.tagList}" - ++ optional service.runUntagged + ++ optional (service.authenticationTokenConfigFile == null && service.runUntagged) "--run-untagged" - ++ optional service.protected + ++ optional (service.authenticationTokenConfigFile == null && service.protected) "--access-level ref_protected" ++ optional service.debugTraceDisabled "--debug-trace-disabled" @@ -214,9 +254,14 @@ in { # nix store will be readable in runner, might be insecure nix = { # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` + # - `CI_SERVER_URL` + # - `REGISTRATION_TOKEN` + # + # NOTE: Support for runner registration tokens will be removed in GitLab 18.0. + # Please migrate to runner authentication tokens soon. For reference, the example + # runners below this one are configured with authentication tokens instead. registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "alpine"; dockerVolumes = [ "/nix/store:/nix/store:ro" @@ -255,8 +300,9 @@ in { docker-images = { # File should contain at least these two variables: # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = "/run/secrets/gitlab-runner-docker-images-token-env"; + dockerImage = "docker:stable"; dockerVolumes = [ "/var/run/docker.sock:/var/run/docker.sock" @@ -269,8 +315,9 @@ in { shell = { # File should contain at least these two variables: # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = "/run/secrets/gitlab-runner-shell-token-env"; + executor = "shell"; tagList = [ "shell" ]; }; @@ -278,30 +325,67 @@ in { default = { # File should contain at least these two variables: # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = "/run/secrets/gitlab-runner-default-token-env"; dockerImage = "debian:stable"; }; } ''; type = types.attrsOf (types.submodule { options = { + authenticationTokenConfigFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Absolute path to a file containing environment variables used for + gitlab-runner registrations with *runner authentication tokens*. + They replace the deprecated *runner registration tokens*, as + outlined in the [GitLab documentation]. + + A list of all supported environment variables can be found with + `gitlab-runner register --help`. + + The ones you probably want to set are: + - `CI_SERVER_URL=` + - `CI_SERVER_TOKEN=` + + ::: {.warning} + Make sure to use a quoted absolute path, + or it is going to be copied to Nix Store. + ::: + + [GitLab documentation]: https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#estimated-time-frame-for-planned-changes + ''; + }; registrationConfigFile = mkOption { - type = types.path; + type = with types; nullOr path; + default = null; description = '' Absolute path to a file with environment variables - used for gitlab-runner registration. + used for gitlab-runner registration with *runner registration + tokens*. + A list of all supported environment variables can be found in `gitlab-runner register --help`. - Ones that you probably want to set is + The ones you probably want to set are: + - `CI_SERVER_URL=` + - `REGISTRATION_TOKEN=` - `CI_SERVER_URL=` + Support for *runner registration tokens* is deprecated since + GitLab 16.0, has been disabled by default in GitLab 17.0 and + will be removed in GitLab 18.0, as outlined in the + [GitLab documentation]. Please consider migrating to + [runner authentication tokens] and check the documentation on + {option}`services.gitlab-runner.services..authenticationTokenConfigFile`. - `REGISTRATION_TOKEN=` - - WARNING: make sure to use quoted absolute path, + ::: {.warning} + Make sure to use a quoted absolute path, or it is going to be copied to Nix Store. + ::: + + [GitLab documentation]: https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#estimated-time-frame-for-planned-changes + [runner authentication tokens]: https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#the-new-runner-registration-workflow ''; }; registrationFlags = mkOption { @@ -439,6 +523,9 @@ in { default = [ ]; description = '' Tag list. + + This option has no effect for runners registered with an runner + authentication tokens and will be ignored. ''; }; runUntagged = mkOption { @@ -447,6 +534,9 @@ in { description = '' Register to run untagged builds; defaults to `true` when {option}`tagList` is empty. + + This option has no effect for runners registered with an runner + authentication tokens and will be ignored. ''; }; limit = mkOption { @@ -470,6 +560,9 @@ in { description = '' What is the maximum timeout (in seconds) that will be set for job when using this Runner. 0 (default) simply means don't limit. + + This option has no effect for runners registered with an runner + authentication tokens and will be ignored. ''; }; protected = mkOption { @@ -478,6 +571,9 @@ in { description = '' When set to true Runner will only run on pipelines triggered on protected branches. + + This option has no effect for runners registered with an runner + authentication tokens and will be ignored. ''; }; debugTraceDisabled = mkOption { @@ -530,9 +626,67 @@ in { }; }; config = mkIf cfg.enable { - warnings = mapAttrsToList - (n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") - (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services); + assertions = + mapAttrsToList (name: serviceConfig: { + assertion = serviceConfig.registrationConfigFile == null || serviceConfig.authenticationTokenConfigFile == null; + message = "`services.gitlab-runner.${name}.registrationConfigFile` and `services.gitlab-runner.services.${name}.authenticationTokenConfigFile` are mutually exclusive."; + }) cfg.services; + + warnings = + mapAttrsToList + (name: serviceConfig: "services.gitlab-runner.services.${name}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") + (filterAttrs (name: serviceConfig: isStorePath serviceConfig.registrationConfigFile) cfg.services) + ++ mapAttrsToList + (name: serviceConfig: "services.gitlab-runner.services.${name}.`authenticationTokenConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") + (filterAttrs (name: serviceConfig: isStorePath serviceConfig.authenticationTokenConfigFile) cfg.services) + ++ mapAttrsToList + (name: serviceConfig: '' + Runner registration tokens have been deprecated and disabled by default in GitLab >= 17.0. + Consider migrating to runner authentication tokens by setting `services.gitlab-runner.services.${name}.authenticationTokenConfigFile`. + https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html'' + ) + ( + filterAttrs (name: serviceConfig: + serviceConfig.authenticationTokenConfigFile == null + ) cfg.services + ) + ++ mapAttrsToList + (name: serviceConfig: '' + `services.gitlab-runner.services.${name}.protected` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + ) + ( + filterAttrs (name: serviceConfig: + serviceConfig.authenticationTokenConfigFile != null && serviceConfig.protected == true + ) cfg.services + ) + ++ mapAttrsToList + (name: serviceConfig: '' + `services.gitlab-runner.services.${name}.runUntagged` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + ) + ( + filterAttrs (name: serviceConfig: + serviceConfig.authenticationTokenConfigFile != null && serviceConfig.runUntagged == true + ) cfg.services + ) + ++ mapAttrsToList + (name: v: '' + `services.gitlab-runner.services.${name}.maximumTimeout` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + ) + ( + filterAttrs (name: serviceConfig: + serviceConfig.authenticationTokenConfigFile != null && serviceConfig.maximumTimeout != 0 + ) cfg.services + ) + ++ mapAttrsToList + (name: v: '' + `services.gitlab-runner.services.${name}.tagList` with runner authentication tokens has no effect and will be ignored. Please remove it from your configuration.'' + ) + ( + filterAttrs (serviceName: serviceConfig: + serviceConfig.authenticationTokenConfigFile != null && serviceConfig.tagList != [ ] + ) cfg.services + ) + ; environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { @@ -545,15 +699,19 @@ in { environment = config.networking.proxy.envVars // { HOME = "/var/lib/gitlab-runner"; }; - path = with pkgs; [ - bash - gawk - jq - moreutils - remarshal - util-linux - cfg.package - ] ++ cfg.extraPackages; + + path = + (with pkgs; [ + bash + gawk + jq + moreutils + remarshal + util-linux + ]) + ++ [ cfg.package ] + ++ cfg.extraPackages; + reloadIfChanged = true; serviceConfig = { # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig` diff --git a/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix b/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix index e38931b6b7..7a3afc5efa 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix @@ -37,7 +37,7 @@ in description = "The port to bind to."; }; - enableUnixSocket = mkEnableOption "Unix Domain Socket at /run/memcached/memcached.sock instead of listening on an IP address and port. The `listen` and `port` options are ignored."; + enableUnixSocket = mkEnableOption "Unix Domain Socket at /run/memcached/memcached.sock instead of listening on an IP address and port. The `listen` and `port` options are ignored"; maxMemory = mkOption { type = types.ints.unsigned; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix index 4369ec2007..c3f1872e08 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix @@ -620,6 +620,6 @@ in { }; meta = { - maintainers = with lib.maintainers; [ patternspandemic jonringer ]; + maintainers = with lib.maintainers; [ patternspandemic ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix index 796e24286f..01a5bfa1de 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix @@ -8,7 +8,7 @@ cfg = config.services.desktopManager.plasma6; inherit (pkgs) kdePackages; - inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types; + inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOption types; activationScript = '' # will be rebuilt automatically @@ -29,7 +29,7 @@ in { description = "Enable Qt 5 integration (theming, etc). Disable for a pure Qt 6 system."; }; - notoPackage = mkPackageOptionMD pkgs "Noto fonts - used for UI by default" { + notoPackage = mkPackageOption pkgs "Noto fonts - used for UI by default" { default = ["noto-fonts"]; example = "noto-fonts-lgc-plus"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin-anything.nix b/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin-anything.nix new file mode 100644 index 0000000000..4e88a78955 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin-anything.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, ... }: + +{ + + meta = { + maintainers = lib.teams.deepin.members; + }; + + options = { + + services.deepin.deepin-anything = { + + enable = lib.mkEnableOption "deepin anything file search tool"; + + }; + + }; + + config = lib.mkIf config.services.deepin.dde-api.enable { + environment.systemPackages = [ pkgs.deepin.deepin-anything ]; + + services.dbus.packages = [ pkgs.deepin.deepin-anything ]; + + users.groups.deepin-anything = { }; + + users.users.deepin-anything = { + description = "Deepin Anything Server"; + home = "/var/lib/deepin-anything"; + createHome = true; + group = "deepin-anything"; + isSystemUser = true; + }; + + boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything-module ]; + boot.kernelModules = [ "vfs_monitor" ]; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/playerctld.nix b/third_party/nixpkgs/nixos/modules/services/desktops/playerctld.nix new file mode 100644 index 0000000000..ef4866d757 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/playerctld.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.playerctld; +in +{ + options.services.playerctld = { + enable = lib.mkEnableOption "the playerctld daemon"; + + package = lib.mkPackageOption pkgs "playerctl" { }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.user.services.playerctld = { + description = "Playerctld daemon to track media player activity"; + wantedBy = [ "default.target" ]; + + serviceConfig = { + Type = "exec"; + ExecStart = "${cfg.package}/bin/playerctld"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ aacebedo ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/games/armagetronad.nix b/third_party/nixpkgs/nixos/modules/services/games/armagetronad.nix index 71c8528a9f..dfeadb1902 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/armagetronad.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/armagetronad.nix @@ -36,7 +36,7 @@ in options = { enable = mkEnableOption "armagetronad"; - package = lib.mkPackageOptionMD pkgs "armagetronad-dedicated" { + package = lib.mkPackageOption pkgs "armagetronad-dedicated" { example = '' pkgs.armagetronad."0.2.9-sty+ct+ap".dedicated ''; diff --git a/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix b/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix index 1958fd4141..b9ed49937a 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix @@ -95,7 +95,7 @@ in services.teeworlds = { enable = mkEnableOption "Teeworlds Server"; - package = mkPackageOptionMD pkgs "teeworlds-server" { }; + package = mkPackageOption pkgs "teeworlds-server" { }; openPorts = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/auto-epp.nix b/third_party/nixpkgs/nixos/modules/services/hardware/auto-epp.nix index b568dec26f..1d939a9814 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/auto-epp.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/auto-epp.nix @@ -10,7 +10,7 @@ in { services.auto-epp = { enable = lib.mkEnableOption "auto-epp for amd active pstate"; - package = lib.mkPackageOptionMD pkgs "auto-epp" {}; + package = lib.mkPackageOption pkgs "auto-epp" {}; settings = mkOption { type = types.submodule { diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix index 6ae5b4e587..1f7e4ffb92 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix @@ -51,5 +51,5 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ jonringer ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix index f5c5479e8e..97d1e2796a 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix @@ -11,7 +11,7 @@ in options.services.ebusd = { enable = mkEnableOption "ebusd, a daemon for communication with eBUS heating systems"; - package = mkPackageOptionMD pkgs "ebusd" { }; + package = mkPackageOption pkgs "ebusd" { }; device = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/matter-server.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/matter-server.nix index 7bf1cfe54d..08a68db713 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/matter-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/matter-server.nix @@ -19,7 +19,7 @@ in options.services.matter-server = with types; { enable = mkEnableOption "Matter-server"; - package = mkPackageOptionMD pkgs "python-matter-server" { }; + package = mkPackageOption pkgs "python-matter-server" { }; port = mkOption { type = types.port; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix index faca10551a..0da95b9c8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix @@ -52,7 +52,7 @@ let in { options.services.mautrix-signal = { - enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge."; + enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge"; settings = lib.mkOption { apply = lib.recursiveUpdate defaultConfig; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix index 31f64c16d7..d124edc216 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix @@ -47,7 +47,7 @@ in { options.services.mautrix-whatsapp = { - enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp."; + enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp"; settings = lib.mkOption { type = settingsFormat.type; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix index 925139b449..d07ce1e66b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix @@ -124,7 +124,7 @@ let in { options = { services.mqtt2influxdb = { - enable = mkEnableOption "BigClown MQTT to InfluxDB bridge."; + enable = mkEnableOption "BigClown MQTT to InfluxDB bridge"; package = mkPackageOption pkgs ["python3Packages" "mqtt2influxdb"] {}; environmentFiles = mkOption { type = types.listOf types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix b/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix index 1467c3f93b..a0a32f1702 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix @@ -1,13 +1,10 @@ { config, lib, pkgs, ... }: let - inherit (lib) types; + inherit (lib) types mkBefore; cfg = config.services.ollama; ollamaPackage = cfg.package.override { inherit (cfg) acceleration; - linuxPackages = config.boot.kernelPackages // { - nvidia_x11 = config.hardware.nvidia.package; - }; }; in { @@ -132,6 +129,14 @@ in Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient. ''; }; + loadModels = lib.mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + The models to download as soon as the service starts. + Search for models of your choice from: https://ollama.com/library + ''; + }; openFirewall = lib.mkOption { type = types.bool; default = false; @@ -161,6 +166,14 @@ in DynamicUser = cfg.sandbox; ReadWritePaths = cfg.writablePaths; }; + postStart = mkBefore '' + set -x + export OLLAMA_HOST=${lib.escapeShellArg cfg.host}:${builtins.toString cfg.port} + for model in ${lib.escapeShellArgs cfg.loadModels} + do + ${lib.escapeShellArg (lib.getExe ollamaPackage)} pull "$model" + done + ''; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index e564fe3b83..6d6a49c10b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -225,7 +225,7 @@ in effectively never complete due to running into timeouts. This sets `OMP_NUM_THREADS` to `1` in order to mitigate the issue. See - https://github.com/NixOS/nixpkgs/issues/240591 for more information. + https://github.com/NixOS/nixpkgs/issues/240591 for more information '' // mkOption { default = true; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix b/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix index c7abb2cfa2..a9a069b0c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix @@ -70,7 +70,7 @@ in To activate dex, first a search user must be created in the Portunus web ui and then the password must to be set as the `DEX_SEARCH_USER_PASSWORD` environment variable - in the [](#opt-services.dex.environmentFile) setting. + in the [](#opt-services.dex.environmentFile) setting ''; oidcClients = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/spice-autorandr.nix b/third_party/nixpkgs/nixos/modules/services/misc/spice-autorandr.nix index 0d58d28657..92b8a15e93 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/spice-autorandr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/spice-autorandr.nix @@ -6,7 +6,7 @@ in { options = { services.spice-autorandr = { - enable = lib.mkEnableOption "spice-autorandr service that will automatically resize display to match SPICE client window size."; + enable = lib.mkEnableOption "spice-autorandr service that will automatically resize display to match SPICE client window size"; package = lib.mkPackageOption pkgs "spice-autorandr" { }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix index 8312a425d2..7ebbc7f2f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix @@ -24,6 +24,13 @@ in Enable SSL/TLS encryption. ''; }; + gpu = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable GPU monitoring. + ''; + }; disableCommandExecute = lib.mkOption { type = lib.types.bool; default = true; @@ -46,7 +53,12 @@ in ''; }; reportDelay = lib.mkOption { - type = lib.types.enum [ 1 2 3 4 ]; + type = lib.types.enum [ + 1 + 2 + 3 + 4 + ]; default = 1; description = '' The interval between system status reportings. @@ -96,6 +108,7 @@ in ++ lib.optional cfg.skipConnection "--skip-conn" ++ lib.optional cfg.skipProcess "--skip-procs" ++ lib.optional cfg.tls "--tls" + ++ lib.optional cfg.gpu "--gpu" ); wantedBy = [ "multi-user.target" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 2dc12a221b..dc357f6cc5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -52,7 +52,6 @@ let "lnd" "mail" "mikrotik" - "minio" "modemmanager" "mongodb" "mysqld" @@ -279,20 +278,16 @@ let in { - imports = (lib.forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter" - "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" - "snmpExporter" "unifiExporter" "varnishExporter" ] - (opt: lib.mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' - The prometheus exporters are now configured using `services.prometheus.exporters'. - See the 18.03 release notes for more information. - '' )); - options.services.prometheus.exporters = mkOption { type = types.submodule { options = (mkSubModules); imports = [ ../../../misc/assertions.nix (lib.mkRenamedOptionModule [ "unifi-poller" ] [ "unpoller" ]) + (lib.mkRemovedOptionModule [ "minio" ] '' + The Minio exporter has been removed, as it was broken and unmaintained. + See the 24.11 release notes for more information. + '') ]; }; description = "Prometheus exporter configuration"; @@ -438,11 +433,7 @@ in '' ) ] ++ config.services.prometheus.exporters.warnings; - }] ++ [(mkIf config.services.minio.enable { - services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; - services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; - services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; - })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { + }] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; })] ++ [(mkIf config.services.postfix.enable { services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix deleted file mode 100644 index 8faff5908b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, pkgs, options, ... }: - -let - cfg = config.services.prometheus.exporters.minio; - inherit (lib) - mkOption - types - optionalString - concatStringsSep - escapeShellArg - ; -in -{ - port = 9290; - extraOpts = { - minioAddress = mkOption { - type = types.str; - example = "https://10.0.0.1:9000"; - description = '' - The URL of the minio server. - Use HTTPS if Minio accepts secure connections only. - By default this connects to the local minio server if enabled. - ''; - }; - - minioAccessKey = mkOption { - type = types.str; - example = "yourMinioAccessKey"; - description = '' - The value of the Minio access key. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and `config.services.minio.accessKey`. - ''; - }; - - minioAccessSecret = mkOption { - type = types.str; - description = '' - The value of the Minio access secret. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and `config.services.minio.secretKey`. - ''; - }; - - minioBucketStats = mkOption { - type = types.bool; - default = false; - description = '' - Collect statistics about the buckets and files in buckets. - It requires more computation, use it carefully in case of large buckets.. - ''; - }; - }; - serviceOpts = { - serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -minio.server ${cfg.minioAddress} \ - -minio.access-key ${escapeShellArg cfg.minioAccessKey} \ - -minio.access-secret ${escapeShellArg cfg.minioAccessSecret} \ - ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix index 21e6128c72..ea4dd43cbb 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix @@ -4,7 +4,7 @@ let UDPPorts = [21116]; in { options.services.rustdesk-server = with lib; with types; { - enable = mkEnableOption "RustDesk, a remote access and remote control software, allowing maintenance of computers and other devices."; + enable = mkEnableOption "RustDesk, a remote access and remote control software, allowing maintenance of computers and other devices"; package = mkPackageOption pkgs "rustdesk-server" {}; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix index 2c05eaad25..6fd3b5707a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix @@ -10,6 +10,7 @@ let opt = options.services.smartd; nm = cfg.notifications.mail; + ns = cfg.notifications.systembus-notify; nw = cfg.notifications.wall; nx = cfg.notifications.x11; @@ -28,6 +29,12 @@ let ${pkgs.smartmontools}/sbin/smartctl -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE" } | ${nm.mailer} -i "${nm.recipient}" ''} + ${optionalString ns.enable '' + ${pkgs.dbus}/bin/dbus-send --system \ + / net.nuetzlich.SystemNotifications.Notify \ + "string:Problem detected with disk: $SMARTD_DEVICESTRING" \ + "string:Warning message from smartd is: $SMARTD_MESSAGE" + ''} ${optionalString nw.enable '' { ${pkgs.coreutils}/bin/cat << EOF @@ -159,6 +166,24 @@ in }; }; + systembus-notify = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whenever to send systembus-notify notifications. + + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. + + To actually see the notifications in your GUI session, you need to have + `systembus-notify` running as your user, which this + option handles by enabling {option}`services.systembus-notify`. + ''; + }; + }; + wall = { enable = mkOption { default = true; @@ -247,6 +272,8 @@ in serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; + services.systembus-notify.enable = mkDefault ns.enable; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix index f4cec0a545..10f4d08f88 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -696,7 +696,7 @@ in { }; store = paramsToOptions params.store // { - enable = mkEnableOption "the Thanos store node giving access to blocks in a bucket provider."; + enable = mkEnableOption "the Thanos store node giving access to blocks in a bucket provider"; arguments = mkArgumentsOption "store"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix index 0a0d5eadcc..35a2d61da1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix @@ -385,8 +385,8 @@ in power.ups = { enable = mkEnableOption '' - Enables support for Power Devices, such as Uninterruptible Power - Supplies, Power Distribution Units and Solar Controllers. + support for Power Devices, such as Uninterruptible Power + Supplies, Power Distribution Units and Solar Controllers ''; mode = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix index a399aa6c23..8186277b47 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix @@ -183,7 +183,7 @@ in { enableFabs = mkEnableOption '' FABS, the flexible AFS backup system. It stores volumes as dump files, relying on other - pre-existing backup solutions for handling them. + pre-existing backup solutions for handling them ''; buserverArgs = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix index 608b48cf03..f46bf80251 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -10,7 +10,7 @@ in { services.samba-wsdd = { enable = 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. + to be found by Web Service Discovery Clients like Windows ''; interface = mkOption { type = types.nullOr types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gns3-server.nix b/third_party/nixpkgs/nixos/modules/services/networking/gns3-server.nix index ba0d6be30f..ec6a53dddc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gns3-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gns3-server.nix @@ -16,7 +16,7 @@ in { services.gns3-server = { enable = lib.mkEnableOption "GNS3 Server daemon"; - package = lib.mkPackageOptionMD pkgs "gns3-server" { }; + package = lib.mkPackageOption pkgs "gns3-server" { }; auth = { enable = lib.mkEnableOption "password based HTTP authentication to access the GNS3 Server"; @@ -87,18 +87,18 @@ in { }; dynamips = { - enable = lib.mkEnableOption ''Whether to enable Dynamips support.''; - package = lib.mkPackageOptionMD pkgs "dynamips" { }; + enable = lib.mkEnableOption ''Dynamips support''; + package = lib.mkPackageOption pkgs "dynamips" { }; }; ubridge = { - enable = lib.mkEnableOption ''Whether to enable uBridge support.''; - package = lib.mkPackageOptionMD pkgs "ubridge" { }; + enable = lib.mkEnableOption ''uBridge support''; + package = lib.mkPackageOption pkgs "ubridge" { }; }; vpcs = { - enable = lib.mkEnableOption ''Whether to enable VPCS support.''; - package = lib.mkPackageOptionMD pkgs "vpcs" { }; + enable = lib.mkEnableOption ''VPCS support''; + package = lib.mkPackageOption pkgs "vpcs" { }; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix index c764b447b0..19b096bf49 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix @@ -17,7 +17,7 @@ with lib; options = { services.haproxy = { - enable = mkEnableOption "HAProxy, the reliable, high performance TCP/HTTP load balancer."; + enable = mkEnableOption "HAProxy, the reliable, high performance TCP/HTTP load balancer"; package = mkPackageOption pkgs "haproxy" { }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix index 1880aebe7a..973dfa054a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix @@ -312,9 +312,9 @@ in }; faxqclean.enable.spoolInit = mkEnableOption '' - Purge old files from the spooling area with + purging old files from the spooling area with {file}`faxqclean` - each time the spooling area is initialized. + each time the spooling area is initialized ''; faxqclean.enable.frequency = mkOption { type = nullOr nonEmptyStr; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird/dashboard.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird/dashboard.nix index 6fc3086155..788b724231 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/netbird/dashboard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird/dashboard.nix @@ -39,7 +39,7 @@ in package = mkPackageOption pkgs "netbird-dashboard" { }; - enableNginx = mkEnableOption "Nginx reverse-proxy to serve the dashboard."; + enableNginx = mkEnableOption "Nginx reverse-proxy to serve the dashboard"; domain = mkOption { type = str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird/management.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird/management.nix index 52f0339591..f4b5bbf643 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/netbird/management.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird/management.nix @@ -137,7 +137,7 @@ in { options.services.netbird.server.management = { - enable = mkEnableOption "Netbird Management Service."; + enable = mkEnableOption "Netbird Management Service"; package = mkPackageOption pkgs "netbird" { }; @@ -335,7 +335,7 @@ in description = "Log level of the netbird services."; }; - enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird management service."; + enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird management service"; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird/server.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird/server.nix index e3de286a04..1725374d03 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/netbird/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird/server.nix @@ -31,7 +31,7 @@ in options.services.netbird.server = { enable = mkEnableOption "Netbird Server stack, comprising the dashboard, management API and signal service"; - enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird server services."; + enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird server services"; domain = mkOption { type = str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird/signal.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird/signal.nix index 8408d20e87..b53e9d40c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/netbird/signal.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird/signal.nix @@ -28,7 +28,7 @@ in package = mkPackageOption pkgs "netbird" { }; - enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird signal service."; + enableNginx = mkEnableOption "Nginx reverse-proxy for the netbird signal service"; domain = mkOption { type = str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix index 039888e3c0..427835870e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkd-dispatcher.nix @@ -14,7 +14,7 @@ in { enable = mkEnableOption '' Networkd-dispatcher service for systemd-networkd connection status change. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) - for usage. + for usage ''; rules = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix b/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix index f4ed7ecc7d..8c5b5a61a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix @@ -34,9 +34,7 @@ in { [](#opt-programs.nncp.settings) ''; socketActivation = { - enable = mkEnableOption '' - Whether to run nncp-daemon persistently or socket-activated. - ''; + enable = mkEnableOption "socket activation for nncp-daemon"; listenStreams = mkOption { type = with types; listOf str; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/oink.nix b/third_party/nixpkgs/nixos/modules/services/networking/oink.nix index cd0fdf1723..3497ca9220 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/oink.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/oink.nix @@ -77,6 +77,7 @@ in config = mkIf cfg.enable { systemd.services.oink = { description = "Dynamic DNS client for Porkbun"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = "${cfg.package}/bin/oink -c ${oinkConfig}"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-control.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-control.nix index c3a22039aa..95d78a87ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-control.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-control.nix @@ -12,19 +12,19 @@ let reconnect_to_dispatcher = true; }; beacon_db = { - connection = "/var/lib/scion-control/control.beacon.db"; + connection = "/run/scion-control/control.beacon.db"; }; path_db = { - connection = "/var/lib/scion-control/control.path.db"; + connection = "/run/scion-control/control.path.db"; }; trust_db = { - connection = "/var/lib/scion-control/control.trust.db"; + connection = "/run/scion-control/control.trust.db"; }; log.console = { level = "info"; }; }; - configFile = toml.generate "scion-control.toml" (defaultConfig // cfg.settings); + configFile = toml.generate "scion-control.toml" (recursiveUpdate defaultConfig cfg.settings); in { options.services.scion.scion-control = { @@ -35,7 +35,7 @@ in example = literalExpression '' { path_db = { - connection = "/var/lib/scion-control/control.path.db"; + connection = "/run/scion-control/control.path.db"; }; log.console = { level = "info"; @@ -62,7 +62,7 @@ in DynamicUser = true; Restart = "on-failure"; BindPaths = [ "/dev/shm:/run/shm" ]; - StateDirectory = "scion-control"; + RuntimeDirectory = "scion-control"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-daemon.nix index 53b56841c3..8528bec1d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-daemon.nix @@ -12,16 +12,16 @@ let reconnect_to_dispatcher = true; }; path_db = { - connection = "/var/lib/scion-daemon/sd.path.db"; + connection = "/run/scion-daemon/sd.path.db"; }; trust_db = { - connection = "/var/lib/scion-daemon/sd.trust.db"; + connection = "/run/scion-daemon/sd.trust.db"; }; log.console = { level = "info"; }; }; - configFile = toml.generate "scion-daemon.toml" (defaultConfig // cfg.settings); + configFile = toml.generate "scion-daemon.toml" (recursiveUpdate defaultConfig cfg.settings); in { options.services.scion.scion-daemon = { @@ -32,7 +32,7 @@ in example = literalExpression '' { path_db = { - connection = "/var/lib/scion-daemon/sd.path.db"; + connection = "/run/scion-daemon/sd.path.db"; }; log.console = { level = "info"; @@ -57,7 +57,7 @@ in ExecStart = "${pkgs.scion}/bin/scion-daemon --config ${configFile}"; Restart = "on-failure"; DynamicUser = true; - StateDirectory = "scion-daemon"; + RuntimeDirectory = "scion-daemon"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-dispatcher.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-dispatcher.nix index 05d1fd0782..7c9f5e6a38 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-dispatcher.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-dispatcher.nix @@ -15,7 +15,7 @@ let level = "info"; }; }; - configFile = toml.generate "scion-dispatcher.toml" (defaultConfig // cfg.settings); + configFile = toml.generate "scion-dispatcher.toml" (recursiveUpdate defaultConfig cfg.settings); in { options.services.scion.scion-dispatcher = { @@ -66,7 +66,7 @@ in ExecStartPre = "${pkgs.coreutils}/bin/rm -rf /run/shm/dispatcher"; ExecStart = "${pkgs.scion}/bin/scion-dispatcher --config ${configFile}"; Restart = "on-failure"; - StateDirectory = "scion-dispatcher"; + RuntimeDirectory = "scion-dispatcher"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-router.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-router.nix index 488dfd12b3..2cac44ab76 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-router.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion-router.nix @@ -11,7 +11,7 @@ let config_dir = "/etc/scion"; }; }; - configFile = toml.generate "scion-router.toml" (defaultConfig // cfg.settings); + configFile = toml.generate "scion-router.toml" (recursiveUpdate defaultConfig cfg.settings); in { options.services.scion.scion-router = { @@ -42,7 +42,7 @@ in ExecStart = "${pkgs.scion}/bin/scion-router --config ${configFile}"; Restart = "on-failure"; DynamicUser = true; - StateDirectory = "scion-router"; + RuntimeDirectory = "scion-router"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix index 5e3445edbb..b8bfef8b93 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/scion/scion.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -17,6 +17,9 @@ in }; }; config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.scion + ]; services.scion = { scion-dispatcher.enable = true; scion-daemon.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wg-access-server.nix b/third_party/nixpkgs/nixos/modules/services/networking/wg-access-server.nix new file mode 100644 index 0000000000..5876699924 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/wg-access-server.nix @@ -0,0 +1,124 @@ +{ config, pkgs, lib, ... }: +let + inherit (lib) mkEnableOption mkPackageOption mkOption types; + + cfg = config.services.wg-access-server; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "config.yaml" cfg.settings; +in +{ + + options.services.wg-access-server = { + enable = mkEnableOption "wg-access-server"; + + package = mkPackageOption pkgs "wg-access-server" { }; + + settings = mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + dns.enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable/disable the embedded DNS proxy server. + This is enabled by default and allows VPN clients to avoid DNS leaks by sending all DNS requests to wg-access-server itself. + ''; + }; + storage = mkOption { + type = types.str; + default = "sqlite3://db.sqlite"; + description = "A storage backend connection string. See [storage docs](https://www.freie-netze.org/wg-access-server/3-storage/)"; + }; + }; + }; + description = "See https://www.freie-netze.org/wg-access-server/2-configuration/ for possible options"; + }; + + secretsFile = mkOption { + type = types.path; + description = '' + yaml file containing all secrets. this needs to be in the same structure as the configuration. + + This must to contain the admin password and wireguard private key. + As well as the secrets for your auth backend. + + Example: + ```yaml + adminPassword: + wireguard: + privateKey: + auth: + oidc: + clientSecret: + ``` + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = + map + (attrPath: + { + assertion = !lib.hasAttrByPath attrPath config.services.wg-access-server.settings; + message = '' + {option}`services.wg-access-server.settings.${lib.concatStringsSep "." attrPath}` must definded + in {option}`services.wg-access-server.secretsFile`. + ''; + }) + [ + [ "adminPassword" ] + [ "wireguard" "privateKey" ] + [ "auth" "sessionStore" ] + [ "auth" "oidc" "clientSecret" ] + [ "auth" "gitlab" "clientSecret" ] + ]; + + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = "1"; + "net.ipv6.conf.all.forwarding" = "1"; + }; + + systemd.services.wg-access-server = { + description = "WG access server"; + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + script = '' + # merge secrets into main config + yq eval-all "select(fileIndex == 0) * select(fileIndex == 1)" ${configFile} $CREDENTIALS_DIRECTORY/SECRETS_FILE \ + > "$STATE_DIRECTORY/config.yml" + + ${lib.getExe cfg.package} serve --config "$STATE_DIRECTORY/config.yml" + ''; + + path = with pkgs; [ + iptables + # needed by startup script + yq-go + ]; + + serviceConfig = + let + capabilities = [ + "CAP_NET_ADMIN" + ] ++ lib.optional cfg.settings.dns.enabled "CAP_NET_BIND_SERVICE"; + in + { + WorkingDirectory = "/var/lib/wg-access-server"; + StateDirectory = "wg-access-server"; + + LoadCredential = [ + "SECRETS_FILE:${cfg.secretsFile}" + ]; + + # Hardening + DynamicUser = true; + AmbientCapabilities = capabilities; + CapabilityBoundingSet = capabilities; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix index 884325d131..d571c6e4d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -51,11 +51,11 @@ in enable = mkEnableOption "xrdp, the Remote Desktop Protocol server"; - package = mkPackageOptionMD pkgs "xrdp" { }; + package = mkPackageOption pkgs "xrdp" { }; audio = { enable = mkEnableOption "audio support for xrdp sessions. So far it only works with PulseAudio sessions on the server side. No PipeWire support yet"; - package = mkPackageOptionMD pkgs "pulseaudio-module-xrdp" {}; + package = mkPackageOption pkgs "pulseaudio-module-xrdp" {}; }; port = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix index 68c04118fd..2485327ed4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix @@ -34,7 +34,7 @@ in options.services.zerotierone.package = mkPackageOption pkgs "zerotierone" { }; options.services.zerotierone.localConf = mkOption { - default = null; + default = {}; description = '' Optional configuration to be written to the Zerotier JSON-based local.conf. If set, the configuration will be symlinked to `/var/lib/zerotier-one/local.conf` at build time. diff --git a/third_party/nixpkgs/nixos/modules/services/search/hound.nix b/third_party/nixpkgs/nixos/modules/services/search/hound.nix index e3f9c8da37..7aca1adc19 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/hound.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/hound.nix @@ -1,71 +1,66 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.hound; + settingsFormat = pkgs.formats.json { }; in { imports = [ (lib.mkRemovedOptionModule [ "services" "hound" "extraGroups" ] "Use users.users.hound.extraGroups instead") + (lib.mkChangedOptionModule [ "services" "hound" "config" ] [ "services" "hound" "settings" ] (config: builtins.fromJSON config.services.hound.config)) ]; - meta.maintainers = with maintainers; [ SuperSandro2000 ]; + meta.maintainers = with lib.maintainers; [ SuperSandro2000 ]; options = { services.hound = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the hound code search daemon. - ''; - }; + enable = lib.mkEnableOption "hound"; - package = mkPackageOptionMD pkgs "hound" { }; + package = lib.mkPackageOption pkgs "hound" { }; - user = mkOption { + user = lib.mkOption { default = "hound"; - type = types.str; + type = lib.types.str; description = '' User the hound daemon should execute under. ''; }; - group = mkOption { + group = lib.mkOption { default = "hound"; - type = types.str; + type = lib.types.str; description = '' Group the hound daemon should execute under. ''; }; - home = mkOption { + home = lib.mkOption { default = "/var/lib/hound"; - type = types.path; + type = lib.types.path; description = '' The path to use as hound's $HOME. If the default user "hound" is configured then this is the home of the "hound" user. ''; }; - config = mkOption { - type = types.str; - description = '' - The full configuration of the Hound daemon. Note the dbpath - should be an absolute path to a writable location on disk. - ''; - example = literalExpression '' + settings = lib.mkOption { + type = settingsFormat.type; + example = lib.literalExpression '' { - "max-concurrent-indexers" : 2, - "repos" : { - "nixpkgs": { - "url" : "https://www.github.com/NixOS/nixpkgs.git" - } - } + max-concurrent-indexers = 2; + repos.nixpkgs.url = "https://www.github.com/NixOS/nixpkgs.git"; } ''; + description = '' + The full configuration of the Hound daemon. + See the upstream documentation for details. + + :::{.note} + The `dbpath` should be an absolute path to a writable directory. + :::.com/hound-search/hound/blob/main/docs/config-options.md>. + ''; }; - listen = mkOption { - type = types.str; + listen = lib.mkOption { + type = lib.types.str; default = "0.0.0.0:6080"; example = ":6080"; description = '' @@ -75,7 +70,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups = lib.mkIf (cfg.group == "hound") { hound = { }; }; @@ -89,16 +84,19 @@ in { }; }; - systemd.services.hound = let - configFile = pkgs.writeTextFile { - name = "hound.json"; - text = cfg.config; - checkPhase = '' - # check if the supplied text is valid json - ${lib.getExe pkgs.jq} . $target > /dev/null - ''; - }; - in { + environment.etc."hound/config.json".source = pkgs.writeTextFile { + name = "hound-config"; + text = builtins.toJSON cfg.settings; + checkPhase = '' + ${cfg.package}/bin/houndd -check-conf -conf $out + ''; + }; + + services.hound.settings = { + dbpath = "${config.services.hound.home}/data"; + }; + + systemd.services.hound = { description = "Hound Code Search"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -107,7 +105,7 @@ in { Group = cfg.group; WorkingDirectory = cfg.home; ExecStartPre = "${pkgs.git}/bin/git config --global --replace-all http.sslCAinfo /etc/ssl/certs/ca-certificates.crt"; - ExecStart = "${cfg.package}/bin/houndd -addr ${cfg.listen} -conf ${configFile}"; + ExecStart = "${cfg.package}/bin/houndd -addr ${cfg.listen} -conf /etc/hound/config.json"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/quickwit.nix b/third_party/nixpkgs/nixos/modules/services/search/quickwit.nix index 6b2db935cf..c4cc0c2427 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/quickwit.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/quickwit.nix @@ -160,7 +160,7 @@ in ProtectProc = "invisible"; ProtectSystem = "strict"; ReadWritePaths = [ - "/var/lib/quickwit" + cfg.dataDir ]; RestrictAddressFamilies = [ "AF_NETLINK" diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index c4031b64ba..b6ce42d731 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -263,7 +263,7 @@ in ''; type = with types; attrsOf (either lines (submodule ({ name, ... }: { options = { - enabled = mkEnableOption "this jail." // { + enabled = mkEnableOption "this jail" // { default = true; readOnly = name == "DEFAULT"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix index 57cef7e44d..4c686d7426 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix @@ -17,7 +17,7 @@ in enable = mkEnableOption '' haveged entropy daemon, which refills /dev/random when low. - NOTE: does nothing on kernels newer than 5.6. + NOTE: does nothing on kernels newer than 5.6 ''; # source for the note https://github.com/jirka-h/haveged/issues/57 diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/backup.sh b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/backup.sh index 7668da5bc8..0c1cd3aa54 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/backup.sh +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/backup.sh @@ -1,17 +1,21 @@ #!/usr/bin/env bash +# Allow use of !() when copying to not copy certain files +shopt -s extglob + # Based on: https://github.com/dani-garcia/vaultwarden/wiki/Backing-up-your-vault if [ ! -d "$BACKUP_FOLDER" ]; then echo "Backup folder '$BACKUP_FOLDER' does not exist" >&2 exit 1 fi -if [[ ! -f "$DATA_FOLDER"/db.sqlite3 ]]; then - echo "Could not find SQLite database file '$DATA_FOLDER/db.sqlite3'" >&2 - exit 1 +if [[ -f "$DATA_FOLDER"/db.sqlite3 ]]; then + sqlite3 "$DATA_FOLDER"/db.sqlite3 ".backup '$BACKUP_FOLDER/db.sqlite3'" fi -sqlite3 "$DATA_FOLDER"/db.sqlite3 ".backup '$BACKUP_FOLDER/db.sqlite3'" -cp "$DATA_FOLDER"/rsa_key.{der,pem,pub.der} "$BACKUP_FOLDER" -cp -r "$DATA_FOLDER"/attachments "$BACKUP_FOLDER" -cp -r "$DATA_FOLDER"/icon_cache "$BACKUP_FOLDER" +if [ ! -d "$DATA_FOLDER" ]; then + echo "No data folder (yet). This will happen on first launch if backup is triggered before vaultwarden has started." + exit 0 +fi + +cp -r "$DATA_FOLDER"/!(db.*) "$BACKUP_FOLDER"/ diff --git a/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix b/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix index 8af22892a1..bd83d227aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/localtimed.nix @@ -18,6 +18,8 @@ in { geoclue2 to determine the current location. ''; }; + package = mkPackageOption pkgs "localtime" { }; + geoclue2Package = mkPackageOption pkgs "geoclue2-with-demo-agent" { }; }; }; @@ -29,14 +31,14 @@ in { }; # Install the polkit rules. - environment.systemPackages = [ pkgs.localtime ]; + environment.systemPackages = [ cfg.package ]; systemd.services.localtimed = { wantedBy = [ "multi-user.target" ]; partOf = [ "localtimed-geoclue-agent.service" ]; after = [ "localtimed-geoclue-agent.service" ]; serviceConfig = { - ExecStart = "${pkgs.localtime}/bin/localtimed"; + ExecStart = "${cfg.package}/bin/localtimed"; Restart = "on-failure"; Type = "exec"; User = "localtimed"; @@ -48,7 +50,7 @@ in { partOf = [ "geoclue.service" ]; after = [ "geoclue.service" ]; serviceConfig = { - ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; + ExecStart = "${cfg.geoclue2Package}/libexec/geoclue-2.0/demos/agent"; Restart = "on-failure"; Type = "exec"; User = "localtimed"; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix index 009c2ffe0a..609b06b5e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix @@ -8,6 +8,8 @@ let opt = options.services.rtorrent; in { + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + options.services.rtorrent = { enable = mkEnableOption "rtorrent"; @@ -180,7 +182,7 @@ in { # XMLRPC scgi_local = (cfg.rpcsock) - schedule = scgi_group,0,0,"execute.nothrow=chown,\":rtorrent\",(cfg.rpcsock)" + schedule = scgi_group,0,0,"execute.nothrow=chown,\":${cfg.group}\",(cfg.rpcsock)" schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"g+w,o=\",(cfg.rpcsock)" ''; @@ -202,7 +204,31 @@ in { ExecStartPre=''${pkgs.bash}/bin/bash -c "if test -e ${cfg.dataDir}/session/rtorrent.lock && test -z $(${pkgs.procps}/bin/pidof rtorrent); then rm -f ${cfg.dataDir}/session/rtorrent.lock; fi"''; ExecStart="${cfg.package}/bin/rtorrent -n -o system.daemon.set=true -o import=${rtorrentConfigFile}"; RuntimeDirectory = "rtorrent"; - RuntimeDirectoryMode = 755; + RuntimeDirectoryMode = 750; + + CapabilityBoundingSet = [ "" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + # If the default user is changed, there is a good chance that they + # want to store data in e.g.: $HOME directory + # Relax hardening in this case + ProtectHome = lib.mkIf (cfg.user == "rtorrent") true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix index 031c5bbb38..b8e9330498 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix @@ -41,6 +41,12 @@ in { }; in nullOr (nonEmptyListOf fontType); }; + useXkbConfig = mkOption { + description = "Configure keymap from xserver keyboard settings."; + type = types.bool; + default = false; + }; + extraConfig = mkOption { description = "Extra contents of the kmscon.conf file."; type = types.lines; @@ -67,45 +73,39 @@ in { }; config = mkIf cfg.enable { - # Largely copied from unit provided with kmscon source - systemd.units."kmsconvt@.service".text = '' - [Unit] - Description=KMS System Console on %I - Documentation=man:kmscon(1) - After=systemd-user-sessions.service - After=plymouth-quit-wait.service - After=systemd-logind.service - After=systemd-vconsole-setup.service - Requires=systemd-logind.service - Before=getty.target - Conflicts=getty@%i.service - OnFailure=getty@%i.service - IgnoreOnIsolate=yes - ConditionPathExists=/dev/tty0 + systemd.packages = [ pkgs.kmscon ]; - [Service] - ExecStart= - ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} - UtmpIdentifier=%I - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes - TTYVTDisallocate=yes + systemd.services."kmsconvt@" = { + after = [ "systemd-logind.service" "systemd-vconsole-setup.service" ]; + requires = [ "systemd-logind.service" ]; - X-RestartIfChanged=false - ''; + serviceConfig.ExecStart = [ + "" + '' + ${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} + '' + ]; + + restartIfChanged = false; + aliases = [ "autovt@.service" ]; + }; systemd.suppressedSystemUnits = [ "autovt@.service" ]; - systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ]; systemd.services.systemd-vconsole-setup.enable = false; systemd.services.reload-systemd-vconsole-setup.enable = false; services.kmscon.extraConfig = let + xkb = optionals cfg.useXkbConfig + lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( + lib.filterAttrs + (n: v: builtins.elem n ["layout" "model" "options" "variant"] && v != "") + config.services.xserver.xkb + ); render = optionals cfg.hwRender [ "drm" "hwaccel" ]; fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"; - in lib.concatStringsSep "\n" (render ++ fonts); + in lib.concatStringsSep "\n" (xkb ++ render ++ fonts); hardware.graphics.enable = mkIf cfg.hwRender true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix index 84dffc5f9d..2f00c852ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix @@ -8,7 +8,7 @@ in { options = { services.audiobookshelf = { - enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; + enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server"; package = mkPackageOption pkgs "audiobookshelf" { }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix index abb5be50d3..f94a1a8b53 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix @@ -9,7 +9,7 @@ in { services.code-server = { enable = lib.mkEnableOption "code-server"; - package = lib.mkPackageOptionMD pkgs "code-server" { + package = lib.mkPackageOption pkgs "code-server" { example = '' pkgs.vscode-with-extensions.override { vscode = pkgs.code-server; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix index 5562b37e50..c7db999a62 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix @@ -11,7 +11,7 @@ let environment = { PYTHONPATH = pkg.pythonPath; STATIC_ROOT = cfg.dataDir + "/static"; - } // cfg.settings; + } // lib.filterAttrs (_: v: !builtins.isNull v) cfg.settings; environmentFile = pkgs.writeText "healthchecks-environment" (lib.generators.toKeyValue { } environment); @@ -21,6 +21,7 @@ let sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env --preserve-env=PYTHONPATH' fi export $(cat ${environmentFile} | xargs) + ${lib.optionalString (cfg.settingsFile != null) "export $(cat ${cfg.settingsFile} | xargs)"} $sudo ${pkg}/opt/healthchecks/manage.py "$@" ''; in @@ -89,6 +90,12 @@ in ''; }; + settingsFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = opt.settings.description; + }; + settings = lib.mkOption { description = '' Environment variables which are read by healthchecks `(local)_settings.py`. @@ -109,6 +116,8 @@ in have support for a `_FILE` variant, run: - `nix-instantiate --eval --expr '(import {}).healthchecks.secrets'` - or `nix eval 'nixpkgs#healthchecks.secrets'` if the flake support has been enabled. + + If the same variable is set in both `settings` and `settingsFile` the value from `settingsFile` has priority. ''; type = types.submodule (settings: { freeformType = types.attrsOf types.str; @@ -121,8 +130,9 @@ in }; SECRET_KEY_FILE = mkOption { - type = types.path; + type = types.nullOr types.path; description = "Path to a file containing the secret key."; + default = null; }; DEBUG = mkOption { @@ -186,7 +196,9 @@ in WorkingDirectory = cfg.dataDir; User = cfg.user; Group = cfg.group; - EnvironmentFile = [ environmentFile ]; + EnvironmentFile = [ + environmentFile + ] ++ lib.optional (cfg.settingsFile != null) cfg.settingsFile; StateDirectory = mkIf (cfg.dataDir == "/var/lib/healthchecks") "healthchecks"; StateDirectoryMode = mkIf (cfg.dataDir == "/var/lib/healthchecks") "0750"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix index f0e860383a..7997ea1f36 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix @@ -390,7 +390,7 @@ in ''; }; - package = lib.mkPackageOptionMD pkgs "http3-ytproxy" { }; + package = lib.mkPackageOption pkgs "http3-ytproxy" { }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 76753b89ec..247b65c786 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -170,7 +170,7 @@ in ''; }; - caddy.enable = mkEnableOption "Whether to enable caddy reverse proxy to expose jitsi-meet"; + caddy.enable = mkEnableOption "caddy reverse proxy to expose jitsi-meet"; prosody.enable = mkOption { type = bool; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index 36bae25759..5d429675ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -328,7 +328,7 @@ in }; hostname = mkOption { - type = str; + type = nullOr str; example = "keycloak.example.com"; description = '' The hostname part of the public URL used as base for @@ -477,6 +477,10 @@ in assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true; message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably"; } + { + assertion = cfg.settings.hostname != null || ! cfg.settings.hostname-strict or true; + message = "Setting the Keycloak hostname is required, see `services.keycloak.settings.hostname`"; + } { assertion = cfg.settings.hostname-url or null == null; message = '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix index cdd60f572b..dbcd9eae2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix @@ -18,7 +18,15 @@ let limesurveyConfig = pkgs.writeText "config.php" '' [ + 'encryptionnonce' => \trim(\file_get_contents(\getenv('CREDENTIALS_DIRECTORY') . DIRECTORY_SEPARATOR . 'encryption_nonce')), + 'encryptionsecretboxkey' => \trim(\file_get_contents(\getenv('CREDENTIALS_DIRECTORY') . DIRECTORY_SEPARATOR . 'encryption_key')), + ] + ] + ); ?> ''; @@ -35,8 +43,9 @@ in package = mkPackageOption pkgs "limesurvey" { }; encryptionKey = mkOption { - type = types.str; - default = "E17687FC77CEE247F0E22BB3ECF27FDE8BEC310A892347EC13013ABA11AA7EB5"; + type = types.nullOr types.str; + default = null; + visible = false; description = '' This is a 32-byte key used to encrypt variables in the database. You _must_ change this from the default value. @@ -44,14 +53,35 @@ in }; encryptionNonce = mkOption { - type = types.str; - default = "1ACC8555619929DB91310BE848025A427B0F364A884FFA77"; + type = types.nullOr types.str; + default = null; + visible = false; description = '' This is a 24-byte nonce used to encrypt variables in the database. You _must_ change this from the default value. ''; }; + encryptionKeyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + 32-byte key used to encrypt variables in the database. + + Note: It should be string not a store path in order to prevent the password from being world readable + ''; + }; + + encryptionNonceFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + 24-byte used to encrypt variables in the database. + + Note: It should be string not a store path in order to prevent the password from being world readable + ''; + }; + database = { type = mkOption { type = types.enum [ "mysql" "pgsql" "odbc" "mssql" ]; @@ -183,6 +213,22 @@ in { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; message = "a password cannot be specified if services.limesurvey.database.createLocally is set to true"; } + { assertion = cfg.encryptionKey != null || cfg.encryptionKeyFile != null; + message = '' + You must set `services.limesurvey.encryptionKeyFile` to a file containing a 32-character uppercase hex string. + + If this message appears when updating your system, please turn off encryption + in the LimeSurvey interface and create backups before filling the key. + ''; + } + { assertion = cfg.encryptionNonce != null || cfg.encryptionNonceFile != null; + message = '' + You must set `services.limesurvey.encryptionNonceFile` to a file containing a 24-character uppercase hex string. + + If this message appears when updating your system, please turn off encryption + in the LimeSurvey interface and create backups before filling the nonce. + ''; + } ]; services.limesurvey.config = mapAttrs (name: mkDefault) { @@ -204,8 +250,6 @@ in config = { tempdir = "${stateDir}/tmp"; uploaddir = "${stateDir}/upload"; - encryptionnonce = cfg.encryptionNonce; - encryptionsecretboxkey = cfg.encryptionKey; force_ssl = mkIf (cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL) "on"; config.defaultlang = "en"; }; @@ -229,11 +273,26 @@ in phpPackage = pkgs.php81; phpEnv.DBENGINE = "${cfg.database.dbEngine}"; phpEnv.LIMESURVEY_CONFIG = "${limesurveyConfig}"; + # App code cannot access credentials directly since the service starts + # with the root user so we copy the credentials to a place accessible to Limesurvey + phpEnv.CREDENTIALS_DIRECTORY = "${stateDir}/credentials"; settings = { "listen.owner" = config.services.httpd.user; "listen.group" = config.services.httpd.group; } // cfg.poolConfig; }; + systemd.services.phpfpm-limesurvey.serviceConfig = { + ExecStartPre = pkgs.writeShellScript "limesurvey-phpfpm-exec-pre" '' + cp -f "''${CREDENTIALS_DIRECTORY}"/encryption_key "${stateDir}/credentials/encryption_key" + chown ${user}:${group} "${stateDir}/credentials/encryption_key" + cp -f "''${CREDENTIALS_DIRECTORY}"/encryption_nonce "${stateDir}/credentials/encryption_nonce" + chown ${user}:${group} "${stateDir}/credentials/encryption_nonce" + ''; + LoadCredential = [ + "encryption_key:${if cfg.encryptionKeyFile != null then cfg.encryptionKeyFile else pkgs.writeText "key" cfg.encryptionKey}" + "encryption_nonce:${if cfg.encryptionNonceFile != null then cfg.encryptionNonceFile else pkgs.writeText "nonce" cfg.encryptionKey}" + ]; + }; services.httpd = { enable = true; @@ -277,6 +336,7 @@ in "d ${stateDir}/tmp/assets 0750 ${user} ${group} - -" "d ${stateDir}/tmp/runtime 0750 ${user} ${group} - -" "d ${stateDir}/tmp/upload 0750 ${user} ${group} - -" + "d ${stateDir}/credentials 0700 ${user} ${group} - -" "C ${stateDir}/upload 0750 ${user} ${group} - ${cfg.package}/share/limesurvey/upload" ]; @@ -295,6 +355,10 @@ in User = user; Group = group; Type = "oneshot"; + LoadCredential = [ + "encryption_key:${if cfg.encryptionKeyFile != null then cfg.encryptionKeyFile else pkgs.writeText "key" cfg.encryptionKey}" + "encryption_nonce:${if cfg.encryptionNonceFile != null then cfg.encryptionNonceFile else pkgs.writeText "nonce" cfg.encryptionKey}" + ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index f4560ed64b..bfb3e73e65 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/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 = [ "nextcloud26" "nextcloud27" "nextcloud28" ]; + relatedPackages = [ "nextcloud28" "nextcloud29" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; @@ -489,7 +489,7 @@ in { implementation into the virtual filesystem. Further details about this feature can be found in the - [upstream documentation](https://docs.nextcloud.com/server/22/admin_manual/configuration_files/primary_storage.html). + [upstream documentation](https://docs.nextcloud.com/server/22/admin_manual/configuration_files/primary_storage.html) ''; bucket = mkOption { type = types.str; @@ -591,7 +591,7 @@ in { This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). - See . + See '' // { default = true; }; @@ -861,8 +861,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "23.05" then nextcloud25 - else if versionOlder stateVersion "23.11" then nextcloud26 else if versionOlder stateVersion "24.05" then nextcloud27 else nextcloud29 ); diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix index c85cb76e5e..acdc393745 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix @@ -16,6 +16,8 @@ let ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py '' + lib.optionalString cfg.enableLdap '' ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py + '' + lib.optionalString cfg.enableOidc '' + ln -s ${cfg.oidcConfigPath} $out/opt/peering-manager/peering_manager/oidc_config.py ''; })).override { inherit (cfg) plugins; @@ -139,6 +141,24 @@ in { See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options. ''; }; + + enableOidc = mkOption { + type = types.bool; + default = false; + description = '' + Enable OIDC-Authentication for Peering Manager. + + This requires a configuration file being pass through `oidcConfigPath`. + ''; + }; + + oidcConfigPath = mkOption { + type = types.path; + description = '' + Path to the Configuration-File for OIDC-Authentication, will be loaded as `oidc_config.py`. + See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6b-oidc/#configuration) for possible options. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -173,7 +193,10 @@ in { PEERINGDB_API_KEY = file.readline() ''; - plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + plugins = (ps: + (lib.optionals cfg.enableLdap [ ps.django-auth-ldap ]) ++ + (lib.optionals cfg.enableOidc (with ps; [ mozilla-django-oidc pyopenssl josepy ])) + ); }; system.build.peeringManagerPkg = pkg; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix index 1411d11982..2280d9165b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix @@ -35,7 +35,7 @@ in options.services.pretalx = { enable = lib.mkEnableOption "pretalx"; - package = lib.mkPackageOptionMD pkgs "pretalx" {}; + package = lib.mkPackageOption pkgs "pretalx" {}; group = lib.mkOption { type = lib.types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix index 9786b61160..0fb635964f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix @@ -63,7 +63,7 @@ in }; options.services.pretix = { - enable = mkEnableOption "Pretix, a ticket shop application for conferences, festivals, concerts, etc."; + enable = mkEnableOption "Pretix, a ticket shop application for conferences, festivals, concerts, etc"; package = mkPackageOption pkgs "pretix" { }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix index 022bb5e438..df3eeaef16 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix @@ -1,17 +1,15 @@ { config, lib, pkgs, ... }: -with lib; -let - cfg = config.services.shiori; +let cfg = config.services.shiori; in { options = { services.shiori = { - enable = mkEnableOption "Shiori simple bookmarks manager"; + enable = lib.mkEnableOption "Shiori simple bookmarks manager"; - package = mkPackageOption pkgs "shiori" { }; + package = lib.mkPackageOption pkgs "shiori" { }; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = ""; description = '' The IP address on which Shiori will listen. @@ -19,30 +17,55 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8080; description = "The port of the Shiori web application"; }; - webRoot = mkOption { - type = types.str; + webRoot = lib.mkOption { + type = lib.types.str; default = "/"; example = "/shiori"; description = "The root of the Shiori web application"; }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/path/to/environmentFile"; + description = '' + Path to file containing environment variables. + Useful for passing down secrets. + + ''; + }; + + databaseUrl = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "postgres:///shiori?host=/run/postgresql"; + description = "The connection URL to connect to MySQL or PostgreSQL"; + }; }; }; - config = mkIf cfg.enable { - systemd.services.shiori = with cfg; { + config = lib.mkIf cfg.enable { + systemd.services.shiori = { description = "Shiori simple bookmarks manager"; wantedBy = [ "multi-user.target" ]; - - environment.SHIORI_DIR = "/var/lib/shiori"; + after = [ "postgresql.service" "mysql.service" ]; + environment = { + SHIORI_DIR = "/var/lib/shiori"; + } // lib.optionalAttrs (cfg.databaseUrl != null) { + SHIORI_DATABASE_URL = cfg.databaseUrl; + }; serviceConfig = { - ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'"; + ExecStart = + "${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${ + toString cfg.port + }' --webroot '${cfg.webRoot}'"; DynamicUser = true; StateDirectory = "shiori"; @@ -50,15 +73,24 @@ in { RuntimeDirectory = "shiori"; # Security options - + EnvironmentFile = + lib.optional (cfg.environmentFile != null) cfg.environmentFile; BindReadOnlyPaths = [ "/nix/store" # For SSL certificates, and the resolv.conf "/etc" - ]; + ] ++ lib.optional (config.services.postgresql.enable && + cfg.databaseUrl != null && + lib.strings.hasPrefix "postgres://" cfg.databaseUrl) + "/run/postgresql" + ++ lib.optional (config.services.mysql.enable && + cfg.databaseUrl != null && + lib.strings.hasPrefix "mysql://" cfg.databaseUrl) + "/var/run/mysqld"; CapabilityBoundingSet = ""; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; DeviceAllow = ""; @@ -78,7 +110,7 @@ in { ProtectKernelTunables = true; RestrictNamespaces = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictRealtime = true; RestrictSUIDSGID = true; @@ -88,11 +120,17 @@ in { SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" - "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" + "~@cpu-emulation" + "~@debug" + "~@keyring" + "~@memlock" + "~@obsolete" + "~@privileged" + "~@setuid" ]; }; }; }; - meta.maintainers = with maintainers; [ minijackson ]; + meta.maintainers = with lib.maintainers; [ minijackson CaptainJawZ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/silverbullet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/silverbullet.nix index c316d074cb..a6a830e674 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/silverbullet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/silverbullet.nix @@ -12,9 +12,9 @@ in { options = { services.silverbullet = { - enable = lib.mkEnableOption "Silverbullet, an open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application."; + enable = lib.mkEnableOption "Silverbullet, an open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application"; - package = lib.mkPackageOptionMD pkgs "silverbullet" { }; + package = lib.mkPackageOption pkgs "silverbullet" { }; openFirewall = lib.mkOption { type = lib.types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix index 6254fe294e..7d4bc66c73 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix @@ -7,7 +7,7 @@ in { options.services.slskd = with lib; with types; { enable = mkEnableOption "slskd"; - package = mkPackageOptionMD pkgs "slskd" { }; + package = mkPackageOption pkgs "slskd" { }; user = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/suwayomi-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/suwayomi-server.nix index 5b61852a53..caa091685d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/suwayomi-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/suwayomi-server.nix @@ -9,9 +9,9 @@ in { options = { services.suwayomi-server = { - enable = mkEnableOption "Suwayomi, a free and open source manga reader server that runs extensions built for Tachiyomi."; + enable = mkEnableOption "Suwayomi, a free and open source manga reader server that runs extensions built for Tachiyomi"; - package = lib.mkPackageOptionMD pkgs "suwayomi-server" { }; + package = lib.mkPackageOption pkgs "suwayomi-server" { }; dataDir = mkOption { type = types.path; @@ -72,7 +72,7 @@ in }; basicAuthEnabled = mkEnableOption '' - Add basic access authentication to Suwayomi-Server. + basic access authentication for Suwayomi-Server. Enabling this option is useful when hosting on a public network/the Internet ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index f9720c3629..b5ff630a4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -1086,9 +1086,9 @@ in ''; description = "Declarative vhost config"; }; - validateConfigFile = lib.mkEnableOption '' - Validate configuration with pkgs.writeNginxConfig. - '' // { default = true; }; + validateConfigFile = lib.mkEnableOption "validating configuration with pkgs.writeNginxConfig" // { + default = true; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix index e243778cc7..1c5a9af5c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix @@ -21,6 +21,14 @@ in example = "tomcat10"; }; + port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + The TCP port Tomcat should listen on. + ''; + }; + purifyOnStart = lib.mkOption { type = lib.types.bool; default = false; @@ -244,8 +252,12 @@ in hostElementsString = lib.concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; hostElementsSedString = lib.replaceStrings ["\n"] ["\\\n"] hostElementsString; in '' - # Create a modified server.xml which also includes all virtual hosts - sed -e "//a\\"${lib.escapeShellArg hostElementsSedString} \ + # Create a modified server.xml which listens on the given port, + # and also includes all virtual hosts. + # The host modification must be last here, + # else if hostElementsSedString is empty sed gets confused as to what to append + sed -e 's//a\\"${lib.escapeShellArg hostElementsSedString} \ ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml '' } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2e0eef67c0..fa67441e7a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -229,7 +229,6 @@ in }) (mkIf serviceCfg.apps.enable { - programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary); programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); @@ -247,7 +246,6 @@ in pix # external apps shipped with linux-mint - hexchat gnome-calculator gnome-calendar gnome-screenshot diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix index 30bd14adb4..1151178a88 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -53,6 +53,7 @@ in services.deepin.dde-daemon.enable = mkForce true; services.deepin.dde-api.enable = mkForce true; services.deepin.app-services.enable = mkForce true; + services.deepin.deepin-anything.enable = mkDefault true; services.colord.enable = mkDefault true; services.accounts-daemon.enable = mkDefault true; @@ -98,11 +99,12 @@ in "/share/dsg" "/share/deepin-themes" "/share/deepin" + "/share/dde-shell" ]; environment.etc = { "deepin-installer.conf".text = '' - system_info_vendor_name="Copyright (c) 2003-2023 NixOS contributors" + system_info_vendor_name="Copyright (c) 2003-2024 NixOS contributors" ''; }; @@ -140,8 +142,10 @@ in dtkwidget dtkdeclarative qt5platform-plugins + qt6platform-plugins + qt5integration + qt6integration deepin-pw-check - deepin-turbo dde-account-faces deepin-icon-theme @@ -152,7 +156,9 @@ 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 dde-session-shell @@ -171,6 +177,7 @@ in dde-appearance dde-application-manager deepin-service-manager + dde-grand-search ]; optionalPackages = [ onboard # dde-dock plugin @@ -194,7 +201,7 @@ in ++ utils.removePackagesByName optionalPackages config.environment.deepin.excludePackages; services.dbus.packages = with pkgs.deepin; [ - dde-dock + dde-shell dde-launchpad dde-session-ui dde-session-shell @@ -209,9 +216,11 @@ in dde-appearance dde-application-manager deepin-service-manager + dde-grand-search ]; systemd.packages = with pkgs.deepin; [ + dde-shell dde-launchpad dde-file-manager dde-calendar diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index 69a83ecb72..aee2f5b35d 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -165,6 +165,7 @@ in services.tumbler.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.libinput.enable = mkDefault true; # used in xfce4-settings-manager + services.colord.enable = mkDefault true; # Enable default programs programs.dconf.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 107a2f1647..51ab08e74f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -321,6 +321,22 @@ in session include login ''; + login.fprintAuth = mkIf config.services.fprintd.enable false; + gdm-fingerprint.text = mkIf config.services.fprintd.enable '' + auth required pam_shells.so + auth requisite pam_nologin.so + auth requisite pam_faillock.so preauth + auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so + auth optional pam_permit.so + auth required pam_env.so + auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + + account include login + + password required pam_deny.so + + session include login + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 7edaf4e980..94c9f4aa91 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -33,7 +33,10 @@ in (cfg.configFile != null) ''-c "${cfg.configFile}"'' ; - in "${cfg.package}/bin/herbstluftwm ${configFileClause} &"; + in '' + ${cfg.package}/bin/herbstluftwm ${configFileClause} & + waitPID=$! + ''; }; environment.systemPackages = [ cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index d1cd601c2d..650ce593e9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -150,9 +150,13 @@ in HostKey ${initrdKeyPath path} '')} - KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} - Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} - MACs ${concatStringsSep "," sshdCfg.settings.Macs} + '' + lib.optionalString (sshdCfg.settings.KexAlgorithms != null) '' + KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} + '' + lib.optionalString (sshdCfg.settings.Ciphers != null) '' + Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} + '' + lib.optionalString (sshdCfg.settings.Macs != null) '' + MACs ${concatStringsSep "," sshdCfg.settings.Macs} + '' + '' LogLevel ${sshdCfg.settings.LogLevel} @@ -162,6 +166,10 @@ in UseDNS no ''} + ${optionalString (!config.boot.initrd.systemd.enable) '' + SshdSessionPath /bin/sshd-session + ''} + ${cfg.extraConfig} ''; in mkIf enabled { @@ -187,6 +195,7 @@ in boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd + copy_bin_and_libs ${package}/libexec/sshd-session cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib ''; @@ -261,7 +270,10 @@ in config.boot.initrd.network.ssh.authorizedKeys ++ (map (file: lib.fileContents file) config.boot.initrd.network.ssh.authorizedKeyFiles)); }; - storePaths = ["${package}/bin/sshd"]; + storePaths = [ + "${package}/bin/sshd" + "${package}/libexec/sshd-session" + ]; services.sshd = { description = "SSH Daemon"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 14a4ab596b..76a6751b05 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -489,7 +489,7 @@ in system.nssModules = [ cfg.package.out ]; system.nssDatabases = { hosts = (mkMerge [ - (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd) + (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is 501) (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules ]); passwd = (mkMerge [ diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index 80ca69e495..87932075f3 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -64,14 +64,6 @@ let etcHardlinks = filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc'; - build-composefs-dump = pkgs.runCommand "build-composefs-dump.py" - { - buildInputs = [ pkgs.python3 ]; - } '' - install ${./build-composefs-dump.py} $out - patchShebangs --host $out - ''; - in { @@ -295,10 +287,12 @@ in system.build.etcMetadataImage = let etcJson = pkgs.writeText "etc-json" (builtins.toJSON etc'); - etcDump = pkgs.runCommand "etc-dump" { } "${build-composefs-dump} ${etcJson} > $out"; + etcDump = pkgs.runCommand "etc-dump" { } '' + ${lib.getExe pkgs.buildPackages.python3} ${./build-composefs-dump.py} ${etcJson} > $out + ''; in pkgs.runCommand "etc-metadata.erofs" { - nativeBuildInputs = [ pkgs.composefs pkgs.erofs-utils ]; + nativeBuildInputs = with pkgs.buildPackages; [ composefs erofs-utils ]; } '' mkcomposefs --from-file ${etcDump} $out fsck.erofs $out diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 2b365bc555..00b6b28eb6 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -57,12 +57,12 @@ in options.testing = { initrdBackdoor = lib.mkEnableOption '' - enable backdoor.service in initrd. Requires + backdoor.service in initrd. Requires boot.initrd.systemd.enable to be enabled. Boot will pause in stage 1 at initrd.target, and will listen for commands from the Machine python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use - machine.switch_root() to leave stage 1 and proceed to stage 2. + machine.switch_root() to leave stage 1 and proceed to stage 2 ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix index 87568390bd..2b69a7a076 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix @@ -149,7 +149,7 @@ in Users in the "incus-admin" group can interact with the daemon (e.g. to start or stop containers) using the - {command}`incus` command line tool, among others. + {command}`incus` command line tool, among others ''; package = lib.mkPackageOption pkgs "incus-lts" { }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix index 226ece8176..72c2a2ef55 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix @@ -332,6 +332,14 @@ in libvirt NSS module options. ''; }; + + sshProxy = mkOption { + type = types.bool; + default = true; + description = '' + Weither to configure OpenSSH to use the [SSH Proxy](https://libvirt.org/ssh-proxy.html). + ''; + }; }; @@ -382,6 +390,10 @@ in source = "${cfg.qemu.package}/libexec/qemu-bridge-helper"; }; + programs.ssh.extraConfig = mkIf cfg.sshProxy '' + Include ${cfg.package}/etc/ssh/ssh_config.d/30-libvirt-ssh-proxy.conf + ''; + systemd.packages = [ cfg.package ]; systemd.services.libvirtd-config = { @@ -533,9 +545,10 @@ in }; system.nssModules = optional (cfg.nss.enable or cfg.nss.enableGuest) cfg.package; - system.nssDatabases.hosts = builtins.concatLists [ - (optional cfg.nss.enable "libvirt") - (optional cfg.nss.enableGuest "libvirt_guest") + system.nssDatabases.hosts = mkMerge [ + # ensure that the NSS modules come between mymachines (which is 400) and resolve (which is 501) + (mkIf cfg.nss.enable (mkOrder 430 [ "libvirt" ])) + (mkIf cfg.nss.enableGuest (mkOrder 432 [ "libvirt_guest" ])) ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix index 7918a716a8..8a55282c88 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix @@ -10,9 +10,7 @@ in { options = { virtualisation.multipass = { - enable = lib.mkEnableOption '' - Multipass, a simple manager for virtualised Ubuntu instances. - ''; + enable = lib.mkEnableOption "Multipass, a simple manager for virtualised Ubuntu instances"; logLevel = lib.mkOption { type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 3b81cfaf2b..d1dc6404d4 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -900,7 +900,7 @@ in }; virtualisation.tpm = { - enable = mkEnableOption "a TPM device in the virtual machine with a driver, using swtpm."; + enable = mkEnableOption "a TPM device in the virtual machine with a driver, using swtpm"; package = mkPackageOption cfg.host.pkgs "swtpm" { }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index a34fe132ba..4808652a54 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -89,7 +89,7 @@ in Enable KVM support for VirtualBox. This increases compatibility with Linux kernel versions, because the VirtualBox kernel modules are not required. - This option is incompatible with `enableHardening` and `addNetworkInterface`. + This option is incompatible with `addNetworkInterface`. Note: This is experimental. Please check https://github.com/cyberus-technology/virtualbox-kvm/issues. ''; @@ -136,18 +136,6 @@ in assertion = !cfg.addNetworkInterface; message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; } - - { - assertion = !cfg.enableHardening; - message = "VirtualBox KVM is not compatible with hardening: Please turn off virtualisation.virtualbox.host.enableHardening."; - } - ]; - - warnings = [ - '' - KVM support in VirtualBox is experimental. Not all security features are available yet. - See: https://github.com/cyberus-technology/virtualbox-kvm/issues/12 - '' ]; }) (mkIf (!cfg.enableKvm) { boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 1db9f702e2..d16b747bfa 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -651,6 +651,7 @@ in { nix-config = handleTest ./nix-config.nix {}; nix-ld = handleTest ./nix-ld.nix {}; nix-misc = handleTest ./nix/misc.nix {}; + nix-required-mounts = runTest ./nix-required-mounts; nix-serve = handleTest ./nix-serve.nix {}; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; @@ -824,6 +825,7 @@ in { rstudio-server = handleTest ./rstudio-server.nix {}; rsyncd = handleTest ./rsyncd.nix {}; rsyslogd = handleTest ./rsyslogd.nix {}; + rtorrent = handleTest ./rtorrent.nix {}; rxe = handleTest ./rxe.nix {}; sabnzbd = handleTest ./sabnzbd.nix {}; samba = handleTest ./samba.nix {}; @@ -1041,6 +1043,7 @@ in { wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; wireguard = handleTest ./wireguard {}; + wg-access-server = handleTest ./wg-access-server.nix {}; without-nix = handleTest ./without-nix.nix {}; wmderland = handleTest ./wmderland.nix {}; workout-tracker = handleTest ./workout-tracker.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/buildbot.nix b/third_party/nixpkgs/nixos/tests/buildbot.nix index 149d73bba0..0f65ac21c8 100644 --- a/third_party/nixpkgs/nixos/tests/buildbot.nix +++ b/third_party/nixpkgs/nixos/tests/buildbot.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" ]; changeSource = [ - "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollInterval=300)" ]; }; networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; diff --git a/third_party/nixpkgs/nixos/tests/kafka.nix b/third_party/nixpkgs/nixos/tests/kafka.nix index f4f9827ab7..8f843e1fc3 100644 --- a/third_party/nixpkgs/nixos/tests/kafka.nix +++ b/third_party/nixpkgs/nixos/tests/kafka.nix @@ -103,13 +103,8 @@ let }) { inherit system; }); in with pkgs; { - kafka_2_8 = makeKafkaTest "kafka_2_8" { kafkaPackage = apacheKafka_2_8; }; - kafka_3_0 = makeKafkaTest "kafka_3_0" { kafkaPackage = apacheKafka_3_0; }; - kafka_3_1 = makeKafkaTest "kafka_3_1" { kafkaPackage = apacheKafka_3_1; }; - kafka_3_2 = makeKafkaTest "kafka_3_2" { kafkaPackage = apacheKafka_3_2; }; - kafka_3_3 = makeKafkaTest "kafka_3_3" { kafkaPackage = apacheKafka_3_3; }; - kafka_3_4 = makeKafkaTest "kafka_3_4" { kafkaPackage = apacheKafka_3_4; }; - kafka_3_5 = makeKafkaTest "kafka_3_5" { kafkaPackage = apacheKafka_3_5; }; + kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; + kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; }; } diff --git a/third_party/nixpkgs/nixos/tests/limesurvey.nix b/third_party/nixpkgs/nixos/tests/limesurvey.nix index 9a3193991f..87e9fe1cdc 100644 --- a/third_party/nixpkgs/nixos/tests/limesurvey.nix +++ b/third_party/nixpkgs/nixos/tests/limesurvey.nix @@ -1,6 +1,6 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "limesurvey"; - meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; + meta.maintainers = [ lib.maintainers.aanderse ]; nodes.machine = { ... }: { services.limesurvey = { @@ -9,6 +9,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { hostName = "example.local"; adminAddr = "root@example.local"; }; + encryptionKeyFile = pkgs.writeText "key" (lib.strings.replicate 32 "0"); + encryptionNonceFile = pkgs.writeText "nonce" (lib.strings.replicate 24 "0"); }; # limesurvey won't work without a dot in the hostname diff --git a/third_party/nixpkgs/nixos/tests/lomiri.nix b/third_party/nixpkgs/nixos/tests/lomiri.nix index e9134a202c..d1fbab7aba 100644 --- a/third_party/nixpkgs/nixos/tests/lomiri.nix +++ b/third_party/nixpkgs/nixos/tests/lomiri.nix @@ -230,7 +230,7 @@ in { # morph-browser has a separate VM test, there isn't anything new we could test here - # Keep it running, we're using it to check content-hub communication from LSS + machine.send_key("alt-f4") # LSS provides DE settings with subtest("system settings open"): @@ -282,9 +282,7 @@ in { # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign machine.send_key("esc") - machine.send_key("alt-f4") # LSS - machine.sleep(2) # focus is slow to switch to second window, closing it *really* helps with OCR afterwards - machine.send_key("alt-f4") # Morph + machine.send_key("alt-f4") # The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session. # There's a test app we could use that also displays their contents, but it's abit inconsistent. diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index 33aa227d2b..9f8b06561b 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -109,4 +109,4 @@ let ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 27 28 29 ]) +listToAttrs (concatMap genTests [ 28 29 ]) diff --git a/third_party/nixpkgs/nixos/tests/nix-required-mounts/default.nix b/third_party/nixpkgs/nixos/tests/nix-required-mounts/default.nix new file mode 100644 index 0000000000..60f894ce0b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-required-mounts/default.nix @@ -0,0 +1,58 @@ +{ pkgs, ... }: + +let + inherit (pkgs) lib; +in + +{ + name = "nix-required-mounts"; + meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; + nodes.machine = + { config, pkgs, ... }: + { + virtualisation.writableStore = true; + system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ]; + nix.nixPath = [ "nixpkgs=${../../..}" ]; + nix.settings.substituters = lib.mkForce [ ]; + nix.settings.system-features = [ "supported-feature" ]; + nix.settings.experimental-features = [ "nix-command" ]; + programs.nix-required-mounts.enable = true; + programs.nix-required-mounts.allowedPatterns.supported-feature = { + onFeatures = [ "supported-feature" ]; + paths = [ + "/supported-feature-files" + { + host = "/usr/lib/imaginary-fhs-drivers"; + guest = "/run/opengl-driver/lib"; + } + ]; + unsafeFollowSymlinks = true; + }; + users.users.person.isNormalUser = true; + systemd.tmpfiles.rules = [ + "d /supported-feature-files 0755 person users -" + "f /usr/lib/libcuda.so 0444 root root - fakeContent" + "L /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root - /usr/lib/libcuda.so" + ]; + }; + testScript = '' + import shlex + + def person_do(cmd, succeed=True): + cmd = shlex.quote(cmd) + cmd = f"su person -l -c {cmd} &>/dev/console" + + if succeed: + return machine.succeed(cmd) + else: + return machine.fail(cmd) + + start_all() + + person_do("nix-build ${./ensure-path-not-present.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-require-feature.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-require-feature.nix} --argstr feature unsupported-feature", succeed=False) + person_do("nix-build ${./test-structured-attrs.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-structured-attrs-empty.nix}") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/third_party/nixpkgs/nixos/tests/nix-required-mounts/ensure-path-not-present.nix new file mode 100644 index 0000000000..270c268fcb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-required-mounts/ensure-path-not-present.nix @@ -0,0 +1,13 @@ +{ + pkgs ? import { }, + feature, +}: + +pkgs.runCommandNoCC "${feature}-not-present" { } '' + if [[ -e /${feature}-files ]]; then + echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway" + exit 1 + else + touch $out + fi +'' diff --git a/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-require-feature.nix b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-require-feature.nix new file mode 100644 index 0000000000..447fd49a30 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -0,0 +1,26 @@ +{ + pkgs ? import { }, + feature, +}: + +pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } '' + if [[ ! -e /${feature}-files ]]; then + echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + exit 1 + fi + libcudaLocation=/run/opengl-driver/lib/libcuda.so + if [[ -e "$libcudaLocation" || -h "$libcudaLocation" ]] ; then + true # we're good + else + echo "The host declares ${feature} support, but it the hook fails to handle the hostPath != guestPath cases" >&2 + exit 1 + fi + if cat "$libcudaLocation" | xargs test fakeContent = ; then + true # we're good + else + echo "The host declares ${feature} support, but it seems to fail to follow symlinks" >&2 + echo "The content of /run/opengl-driver/lib/libcuda.so is: $(cat /run/opengl-driver/lib/libcuda.so)" >&2 + exit 1 + fi + touch $out +'' diff --git a/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix new file mode 100644 index 0000000000..86f2753309 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix @@ -0,0 +1,8 @@ +{ + pkgs ? import { }, +}: + +pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } + '' + touch $out + '' diff --git a/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs.nix new file mode 100644 index 0000000000..874910eee7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-required-mounts/test-structured-attrs.nix @@ -0,0 +1,18 @@ +{ + pkgs ? import { }, + feature, +}: + +pkgs.runCommandNoCC "${feature}-present-structured" + { + __structuredAttrs = true; + requiredSystemFeatures = [ feature ]; + } + '' + if [[ -e /${feature}-files ]]; then + touch $out + else + echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + echo "Do we fail to parse __structuredAttrs=true derivations?" >&2 + fi + '' diff --git a/third_party/nixpkgs/nixos/tests/rtorrent.nix b/third_party/nixpkgs/nixos/tests/rtorrent.nix new file mode 100644 index 0000000000..77e78b549a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rtorrent.nix @@ -0,0 +1,25 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + port = 50001; +in +{ + name = "rtorrent"; + meta = { + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; + }; + + nodes.machine = { pkgs, ... }: { + services.rtorrent = { + inherit port; + enable = true; + }; + }; + + testScript = /* python */ '' + machine.start() + machine.wait_for_unit("rtorrent.service") + machine.wait_for_open_port(${toString port}) + + machine.succeed("nc -z localhost ${toString port}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/shiori.nix b/third_party/nixpkgs/nixos/tests/shiori.nix index d0f68b903f..ba9b42235d 100644 --- a/third_party/nixpkgs/nixos/tests/shiori.nix +++ b/third_party/nixpkgs/nixos/tests/shiori.nix @@ -1,80 +1,81 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: +import ./make-test-python.nix ({ pkgs, lib, ... }: -{ - name = "shiori"; - meta.maintainers = with lib.maintainers; [ minijackson ]; + { + name = "shiori"; + meta.maintainers = with lib.maintainers; [ minijackson ]; - nodes.machine = - { ... }: - { services.shiori.enable = true; }; + nodes.machine = { ... }: { services.shiori.enable = true; }; - testScript = let - authJSON = pkgs.writeText "auth.json" (builtins.toJSON { - username = "shiori"; - password = "gopher"; - owner = true; - }); + testScript = let + authJSON = pkgs.writeText "auth.json" (builtins.toJSON { + username = "shiori"; + password = "gopher"; + owner = true; + }); - insertBookmark = { - url = "http://example.org"; - title = "Example Bookmark"; - }; + insertBookmark = { + url = "http://example.org"; + title = "Example Bookmark"; + }; - insertBookmarkJSON = pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark); - in '' - import json + insertBookmarkJSON = + pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark); + in '' + #import json - machine.wait_for_unit("shiori.service") - machine.wait_for_open_port(8080) - machine.succeed("curl --fail http://localhost:8080/") - machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori") + machine.wait_for_unit("shiori.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080/") + machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori") - with subtest("login"): - auth_json = machine.succeed( - "curl --fail --location http://localhost:8080/api/login " - "-X POST -H 'Content-Type:application/json' -d @${authJSON}" - ) - auth_ret = json.loads(auth_json) - session_id = auth_ret["session"] + # The test code below no longer works because the API authentication has changed. - with subtest("bookmarks"): - with subtest("first use no bookmarks"): - bookmarks_json = machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-H 'X-Session-Id:{}'" - ).format(session_id) - ) + #with subtest("login"): + # auth_json = machine.succeed( + # "curl --fail --location http://localhost:8080/api/login " + # "-X POST -H 'Content-Type:application/json' -d @${authJSON}" + # ) + # auth_ret = json.loads(auth_json) + # session_id = auth_ret["session"] - if json.loads(bookmarks_json)["bookmarks"] != []: - raise Exception("Shiori have a bookmark on first use") + #with subtest("bookmarks"): + # with subtest("first use no bookmarks"): + # bookmarks_json = machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-H 'X-Session-Id:{}'" + # ).format(session_id) + # ) - with subtest("insert bookmark"): - machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-X POST -H 'X-Session-Id:{}' " - "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}" - ).format(session_id) - ) + # if json.loads(bookmarks_json)["bookmarks"] != []: + # raise Exception("Shiori have a bookmark on first use") - with subtest("get inserted bookmark"): - bookmarks_json = machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-H 'X-Session-Id:{}'" - ).format(session_id) - ) + # with subtest("insert bookmark"): + # machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-X POST -H 'X-Session-Id:{}' " + # "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}" + # ).format(session_id) + # ) - bookmarks = json.loads(bookmarks_json)["bookmarks"] - if len(bookmarks) != 1: - raise Exception("Shiori didn't save the bookmark") + # with subtest("get inserted bookmark"): + # bookmarks_json = machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-H 'X-Session-Id:{}'" + # ).format(session_id) + # ) - bookmark = bookmarks[0] - if ( - bookmark["url"] != "${insertBookmark.url}" - or bookmark["title"] != "${insertBookmark.title}" - ): - raise Exception("Inserted bookmark doesn't have same URL or title") - ''; -}) + # bookmarks = json.loads(bookmarks_json)["bookmarks"] + # if len(bookmarks) != 1: + # raise Exception("Shiori didn't save the bookmark") + + # bookmark = bookmarks[0] + # if ( + # bookmark["url"] != "${insertBookmark.url}" + # or bookmark["title"] != "${insertBookmark.title}" + # ): + # raise Exception("Inserted bookmark doesn't have same URL or title") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix index 15d442d476..4ca37b3b91 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix @@ -153,7 +153,7 @@ import ../make-test-python.nix { }) ''; } - ]) (lib.cartesianProductOfSets { + ]) (lib.cartesianProduct { user = [ "root" "dynamic-user" "static-user" ]; privateTmp = [ true false ]; }); diff --git a/third_party/nixpkgs/nixos/tests/tomcat.nix b/third_party/nixpkgs/nixos/tests/tomcat.nix index df5cb033b7..c5e6e65ac6 100644 --- a/third_party/nixpkgs/nixos/tests/tomcat.nix +++ b/third_party/nixpkgs/nixos/tests/tomcat.nix @@ -5,23 +5,24 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { pkgs, ... }: { services.tomcat = { enable = true; + port = 8001; axis2.enable = true; }; }; testScript = '' machine.wait_for_unit("tomcat.service") - machine.wait_for_open_port(8080) + machine.wait_for_open_port(8001) machine.wait_for_file("/var/tomcat/webapps/examples"); machine.succeed( - "curl -sS --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + "curl -sS --fail http://localhost:8001/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" ) machine.succeed( - "curl -sS --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + "curl -sS --fail http://localhost:8001/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" ) machine.succeed( - "curl -sS --fail http://localhost:8080/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'" + "curl -sS --fail http://localhost:8001/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/vaultwarden.nix b/third_party/nixpkgs/nixos/tests/vaultwarden.nix index baefa67dbf..a60cb3af55 100644 --- a/third_party/nixpkgs/nixos/tests/vaultwarden.nix +++ b/third_party/nixpkgs/nixos/tests/vaultwarden.nix @@ -208,6 +208,10 @@ builtins.mapAttrs (k: v: makeVaultwardenTest k v) { server.succeed('[ -d "/var/lib/vaultwarden/backups" ]') server.succeed('[ -f "/var/lib/vaultwarden/backups/db.sqlite3" ]') server.succeed('[ -d "/var/lib/vaultwarden/backups/attachments" ]') + server.succeed('[ -f "/var/lib/vaultwarden/backups/rsa_key.pem" ]') + server.succeed('[ -f "/var/lib/vaultwarden/backups/rsa_key.pub.pem" ]') + # Ensure only the db backed up with the backup command exists and not the other db files. + server.succeed('[ ! -f "/var/lib/vaultwarden/backups/db.sqlite3-shm" ]') ''; }; } diff --git a/third_party/nixpkgs/nixos/tests/wg-access-server.nix b/third_party/nixpkgs/nixos/tests/wg-access-server.nix new file mode 100644 index 0000000000..84fdf43e79 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/wg-access-server.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... }: +{ + name = "wg-access-server"; + meta = with pkgs.lib.maintainers; { + maintainers = [ xanderio ]; + }; + + nodes = { + server = { + services.wg-access-server = { + enable = true; + settings = { + adminUsername = "admin"; + }; + secretsFile = (pkgs.writers.writeYAML "secrets.yaml" { + adminPassword = "hunter2"; + }); + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("wg-access-server.service") + ''; +} +) diff --git a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix index 4115dae3ae..38cee35313 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-FKh2eDBfrXagodrKVVpndf+mQuXrvMzs2R9JcJOZLBw="; + sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix index f837ad6603..67ccc367be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp $script $out/bin/ substituteInPlace $out/bin/$script \ - --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + --replace-fail '$editor = "vim";' '$editor = "${nano}/bin/nano";' wrapProgram $out/bin/$script \ --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.CDDB_get ]}" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index 8e635ddd47..6fce76e9a4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "15.0.2"; + version = "16.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Yz6gL87Vc8iFTRgKhyUgLL1ool+oinvwq2W9OjFl/OQ="; + sha256 = "sha256-LYD1qjSlwv9wGBrZUaYz6Zcvl2n6cLi2aGycr4ZJWdY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix index 426a3d9d1b..0184934ff2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.6"; + version = "5.6.7"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-aBrp+mfY/c6K3dLbDGnEKoUbQC7TlFRQJZCjXPeDZ6s="; + hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 39d258c806..fb27f769f8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.12"; + version = "6.4.13"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-nriw/nP73m27QWdhC5ooTuVMul+GdOUsnVroM/CZiiY="; + hash = "sha256-rvaW4ifXZNAmON+2OZR2JLGPzaTEzk2miKeFHQ7Bp6M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index 72b06a0bab..2c761897ce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aXZsAOsdp0x7J0T9B9C1Qm2qDkhRNHRWUmPafdHRrOQ="; + sha256 = "sha256-1YExpvhCHIdRqFCvOmiG3G7k/qs7q1ITwtZXGMc/SRk="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 0895e368af..4de19279b9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.91"; + version = "1.0.0"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-CS/rCvm7IuVwDN1PURO6ADVXTZkX7OYzKJP8xfOHN4E="; + hash = "sha256-FOoqnJeh29J0clsqZ+wbhQmsaybrAbIqgeB7m/7Q+3M="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 833b4e3b07..16786c77e4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.16"; + version = "7.17"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-UMliD9tk8VDpeQ4tBC31peemv7HAKHW0xtqoSkzYG4Y=" else { - x86_64-linux = "sha256-sK0GVK29SGkLBILeWcFjcvQ956NCPb1HvqmXLeLbgP8="; - aarch64-linux = "sha256-mJ/UtrWaPq3Oar8rMvRFm8iafK1I7bL42deIQyiHVMk="; + hash = if stdenv.isDarwin then "sha256-4+8MhvQ1LhfyhFCOMBgD4HHt0Oaj25y2U04++JuXxCM=" else { + x86_64-linux = "sha256-q3oTKcFSNec10kT1FlDaf2GS967y38VLq9GsquwN2Lg="; + aarch64-linux = "sha256-5mxVkppm1SjC0C0SFI7uEdPWewNZXlrNAxbaFcNzzbU="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix index 25899ad167..e3066cc36d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.17.834.g26ee1129"; + version = "1.2.40.599.g606b7f29"; src = if stdenv.isAarch64 then ( fetchurl { - url = "https://web.archive.org/web/20230808124344/https://download.scdn.co/SpotifyARM64.dmg"; - sha256 = "sha256-u22hIffuCT6DwN668TdZXYedY9PSE7ZnL+ITK78H7FI="; + url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c="; }) else ( fetchurl { - url = "https://web.archive.org/web/20230808124637/https://download.scdn.co/Spotify.dmg"; - sha256 = "sha256-aaYMbZpa2LvyBeXmEAjrRYfYqbudhJHR/hvCNTsNQmw="; + url = "https://web.archive.org/web/20240622065548/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-hvS0xnmJQoQfNJRFsLBQk8AJjDOzDy+OGwNOq5Ms/O0="; }); nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index e432560524..1d9af5caf8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.13.1"; + version = "5.14.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-TnvVm0qjm41if90+f9YtO8wR6NYg6oUZbZd0RiUU33M="; + sha256 = "sha256-3oVQyFtAFqlh4GOgavN2e2TVhCILg6Rhf5GZcot+aKo="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix b/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix index 69069f0124..e3cf437258 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-FfrgeUDKiM9m0mvKlu02KEuvsq+3Gv3yPFW1DIQw05I="; + hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080="; }; - cargoHash = "sha256-xD46aKT18Kl+81Pfv+zleUUKhSV1Px7JFjhXw1/4cBA="; + cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix index 17b006f385..e2dfc14569 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA="; + hash = "sha256-nRNXVJJcpZmAfZwDEBaEFlry1gbITWEw0khtsXnMdm0="; }; - cargoHash = "sha256-bAap8eSXAPLrs5MEX1Pp6gKdp0iLxci4aX+2+ve6Wk0="; + cargoHash = "sha256-E5TaE4TlRA0wmRUiwFqivs18X6oiBCmeXrPI1GxKFBI="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix index d009522f5c..e9d6e5795c 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.1"; + version = "24.06.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; + hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/Cargo.lock index 997f44144d..787f92246e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/Cargo.lock @@ -10,91 +10,64 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.3.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.6.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", + "cfg-if", + "cipher", + "cpufeatures", ] [[package]] name = "aes-gcm" -version = "0.8.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead 0.3.2", + "aead", "aes", - "cipher 0.2.5", + "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 0.2.5", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "alfis" -version = "0.8.4" +version = "0.8.5" dependencies = [ - "base64 0.21.0", + "base64", "bincode", "blakeout", "byteorder", "chacha20poly1305", "chrono", "derive_more", - "digest 0.10.5", - "ecies-ed25519", + "digest 0.10.7", + "ecies-ed25519-ng", "ed25519-dalek", "getopts", "lazy_static", @@ -105,30 +78,42 @@ dependencies = [ "num-traits", "num_cpus", "open", - "rand 0.7.3", - "rand 0.8.5", + "rand", "serde", "serde_bytes", "serde_cbor", "serde_derive", "serde_json", - "sha2 0.10.6", - "signature 2.0.0", + "sha2", + "signature", "simplelog", "spmc", "sqlite", "thread-priority", - "time 0.3.14", + "time", "tinyfiledialogs", - "toml 0.7.2", + "toml 0.8.8", "ureq", "uuid", "web-view", "winapi", + "windows-service", "winres", "x25519-dalek", ] +[[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" @@ -152,21 +137,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] -name = "base64" -version = "0.21.0" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -189,7 +174,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac", "digest 0.9.0", "opaque-debug", ] @@ -206,18 +191,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -230,15 +206,15 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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 = "cairo-sys-rs" @@ -252,9 +228,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.71" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -264,69 +243,60 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.4.3", + "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.44", "wasm-bindgen", - "winapi", -] - -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", + "windows-targets 0.48.5", ] [[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", + "zeroize", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "convert_case" version = "0.4.0" @@ -335,41 +305,36 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[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.1" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" 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.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] @@ -383,38 +348,62 @@ dependencies = [ "subtle", ] -[[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 = "ctr" -version = "0.6.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.2.5", + "cipher", ] [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "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.48", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +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 = "derive_more" version = "0.99.17" @@ -425,7 +414,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -439,73 +428,83 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.0", + "block-buffer", "crypto-common", + "subtle", ] [[package]] -name = "ecies-ed25519" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a882353828f086290bedd0b598e18863a4d2135f8e632c4325ed89a4e5535db" +name = "ecies-ed25519-ng" +version = "0.5.2" +source = "git+https://github.com/Revertron/ecies-ed25519-ng?rev=577c4f2#577c4f2635fc5ccfce24428c6238b3fff5308438" dependencies = [ "aes-gcm", "curve25519-dalek", - "digest 0.9.0", + "digest 0.10.7", "hex", "hkdf", - "rand 0.7.3", - "sha2 0.9.8", + "rand", + "sha2", "thiserror", "zeroize", ] [[package]] name = "ed25519" -version = "1.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 1.6.0", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", - "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2", + "subtle", "zeroize", ] [[package]] -name = "flate2" -version = "1.0.22" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if", "crc32fast", - "libc", "miniz_oxide", ] [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "matches", "percent-encoding", ] @@ -541,9 +540,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -560,31 +559,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" 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", - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "ghash" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", "polyval", @@ -644,23 +632,18 @@ dependencies = [ [[package]] name = "half" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd566f08830dd1fa75b2a5f1d8def8336de7f08b2692a9a71efbe7188aea36f" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.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" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "allocator-api2", ] [[package]] @@ -674,12 +657,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -689,64 +669,98 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.10.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "digest 0.9.0", "hmac", ] [[package]] name = "hmac" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac 0.10.1", - "digest 0.9.0", + "digest 0.10.7", ] [[package]] name = "iana-time-zone" -version = "0.1.47" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", - "once_cell", "wasm-bindgen", - "winapi", + "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.2.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", ] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "javascriptcore-rs-sys" @@ -759,9 +773,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -774,67 +788,57 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.9.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "wasi", + "windows-sys 0.48.0", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -843,9 +847,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -853,18 +857,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -881,9 +885,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -893,12 +897,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.0.3" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys 0.36.1", ] [[package]] @@ -921,21 +926,37 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[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.20" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", @@ -944,52 +965,46 @@ dependencies = [ [[package]] name = "polyval" -version = "0.4.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ - "cpuid-bool", + "cfg-if", + "cpufeatures", "opaque-debug", "universal-hash", ] [[package]] -name = "ppv-lite86" -version = "0.2.14" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +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-macro2" -version = "1.0.51" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" 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" @@ -997,18 +1012,8 @@ 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", + "rand_chacha", + "rand_core", ] [[package]] @@ -1018,49 +1023,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "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", -] - -[[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", + "getrandom", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1074,52 +1060,67 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring", - "sct", - "webpki", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "rustls-pki-types" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" [[package]] -name = "sct" -version = "0.7.0" +name = "rustls-webpki" +version = "0.102.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] -name = "semver" -version = "1.0.4" +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] @@ -1136,20 +1137,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -1158,58 +1159,42 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.7", ] [[package]] name = "signature" -version = "1.6.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a" - -[[package]] -name = "signature" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] [[package]] name = "simplelog" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" +checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.14", + "time", ] [[package]] @@ -1229,9 +1214,19 @@ dependencies = [ [[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" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] [[package]] name = "spmc" @@ -1241,9 +1236,9 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "sqlite" -version = "0.30.4" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1908664131c21a38e5b531344d52a196ec338af5bf44f7fa2c83d539e9561d" +checksum = "03801c10193857d6a4a71ec46cee198a15cbc659622aabe1db0d0bdbefbcf8e6" dependencies = [ "libc", "sqlite3-sys", @@ -1251,9 +1246,9 @@ dependencies = [ [[package]] name = "sqlite3-src" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1815a7a02c996eb8e5c64f61fcb6fd9b12e593ce265c512c5853b2513635691" +checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454" dependencies = [ "cc", "pkg-config", @@ -1261,9 +1256,9 @@ dependencies = [ [[package]] name = "sqlite3-sys" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47c99824fc55360ba00caf28de0b8a0458369b832e016a64c13af0ad9fbb9ee" +checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b" dependencies = [ "libc", "sqlite3-src", @@ -1284,14 +1279,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[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" @@ -1305,15 +1300,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1327,79 +1321,83 @@ dependencies = [ "strum", "strum_macros", "thiserror", - "toml 0.5.9", + "toml 0.5.11", "version-compare", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "thread-priority" -version = "0.10.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978519ae4c6891352f964b88da4ab5a3a9b74a40247cda5baee145dae6cd3b71" +checksum = "b72cb4958060ee2d9540cef68bb3871fd1e547037772c7fe7650d5d1cbec53b3" dependencies = [ + "bitflags", "cfg-if", "libc", "log", + "rustversion", "winapi", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.31" 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" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ + "deranged", "itoa", "libc", "num_threads", + "powerfmt", + "serde", + "time-core", "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +dependencies = [ + "time-core", +] [[package]] name = "tinyfiledialogs" @@ -1413,33 +1411,33 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "toml" -version = "0.7.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -1449,18 +1447,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -1471,91 +1469,83 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] [[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 = "ureq" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" +version = "2.9.1" +source = "git+https://github.com/algesten/ureq#4ddcc3a27a6c8cb88041dc713010455f776fa753" dependencies = [ - "base64 0.13.1", - "chunked_transfer", + "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", + "rustls-webpki", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.2.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -1567,11 +1557,11 @@ checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" [[package]] name = "uuid" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.3", + "getrandom", "serde", ] @@ -1587,18 +1577,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[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" @@ -1607,9 +1585,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1617,24 +1595,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1642,37 +1620,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "web-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-view" version = "0.7.3" -source = "git+https://github.com/Boscop/web-view#e87e08cab3a2d500d54068ec9c7aaa055a711465" +source = "git+https://github.com/Boscop/web-view#82d7cbce6228b1a964673cc0f22944ad808eab42" dependencies = [ "boxfnonce", "tinyfiledialogs", @@ -1702,29 +1670,19 @@ dependencies = [ "soup-sys", ] -[[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.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" dependencies = [ - "webpki", + "rustls-pki-types", ] [[package]] name = "webview-sys" version = "0.6.2" -source = "git+https://github.com/Boscop/web-view#e87e08cab3a2d500d54068ec9c7aaa055a711465" +source = "git+https://github.com/Boscop/web-view#82d7cbce6228b1a964673cc0f22944ad808eab42" dependencies = [ "cc", "gdk-sys", @@ -1738,6 +1696,12 @@ dependencies = [ "webkit2gtk-sys", ] +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.3.9" @@ -1756,9 +1720,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", ] @@ -1770,110 +1734,219 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" 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", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-service" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +dependencies = [ + "bitflags", + "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", - "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", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-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.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +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.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +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.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +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.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +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.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +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 = "winnow" -version = "0.3.3" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -1884,37 +1957,57 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml 0.5.9", + "toml 0.5.11", ] [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] [[package]] -name = "zeroize" -version = "1.3.0" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.48", ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index af1da19f63..690fdc7734 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -1,62 +1,71 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, makeWrapper -, webkitgtk -, zenity -, Cocoa -, Security -, WebKit -, withGui ? true +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + webkitgtk, + zenity, + Cocoa, + Security, + WebKit, + withGui ? true, }: rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.8.4"; + version = "0.8.4-unstable-2024-03-08"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; - rev = "v${version}"; - sha256 = "sha256-BNpz4SjWeZ20CxjyEIaFI43X7P3uoyWqOQssFb38Gv8="; + rev = "28431ec0530405782038e7c02c2dedc3086bd7c9"; + hash = "sha256-HL4RRGXE8PIcD+zTF1xZSyOpKMhKF75Mxm6KLGsR4Hc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "web-view-0.7.3" = "sha256-8C/2bXAbxP5tdo9RLvNn89krzy08+yKy3kERfz31HJE="; + "ecies-ed25519-ng-0.5.2" = "sha256-E+jVbgKKK1DnJWAJN+xGZPCV2n7Gxp2t7XXkDNDnPN4="; + "ureq-2.9.1" = "sha256-ATT2wJ9kmY/Jjw6FEbxqM9pDytKFLmu/ZqH/pJpZTu8="; + "web-view-0.7.3" = "sha256-eVMcpMRZHwOdWhfV6Z1uGUNOmhB41YZPaiz1tRQvhrI="; }; }; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = + lib.optional stdenv.isDarwin Security + ++ lib.optional (withGui && stdenv.isLinux) webkitgtk + ++ lib.optionals (withGui && stdenv.isDarwin) [ + Cocoa + WebKit + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; + checkFlags = [ # these want internet access, disable them "--skip=dns::client::tests::test_tcp_client" "--skip=dns::client::tests::test_udp_client" ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security - ++ lib.optional (withGui && stdenv.isLinux) webkitgtk - ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "doh" - ] ++ lib.optional withGui "webgui"; - postInstall = lib.optionalString (withGui && stdenv.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; - meta = with lib; { + meta = { description = "Alternative Free Identity System"; homepage = "https://alfis.name"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ misuzu ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = lib.platforms.unix; mainProgram = "alfis"; + broken = withGui && stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index 26b2cb94e1..097acda8e8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -38,11 +38,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.16"; + version = "1.9.17"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "sha256-DxYgZgDa3vOHj7svJqu/pdyXKZ+uBTy35Fchw49xxoA="; + sha256 = "1wqzgxsm9p6lh0bmvw0byaxx1r5v64d024jf1pg9mykb1dnnx0wy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix index 8389779a2c..857467c967 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.6"; + version = "0.29.7"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI="; + hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix index 85c8692a56..75b14613b8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "btcsuite"; repo = pname; rev = "v${version}"; - hash = "sha256-TLnJZW2CkvAqPTnJKfBY41siHtdZ+HRABsc+4vnQ9/w="; + hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A="; }; - vendorHash = "sha256-quJEpSDltXhJcgI9H707p3HeLj1uuLzaMplT+YXzh/4="; + vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4="; subPackages = [ "." "cmd/*" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index ed470dec1f..d2b90cf595 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.60.1"; + version = "2.60.2"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-VZzDG9qUjEBSNxQcmkqPTTDQjh7BZFqyRSaCfio8X2I="; + hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ="; fetchSubmodules = true; }; - vendorHash = "sha256-38NmSSK3a70WvhZAZ529wdAMlEuk8/4YqtadoLOn1IY="; + vendorHash = "sha256-r8Hh0UGdUbVOx9r10ymb9bJNZvxm/MzAVA9D0BaIzJg="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 36344bf1a6..5f8b95411e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.81.2"; + version = "2.83.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E="; + hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix index b4056283c5..74d7b8d538 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "lndhub-go"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-YOLqMIfZSGD+AOng1XWCBlzaHkPnQc+2kmDXF2fh+ps="; + sha256 = "sha256-17vvC6J0VdXouGfX4k1kCVRlkXbNSX3AT8QIY8uKDUE="; }; vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 5884fd2a27..b341ca102b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,8 +8,7 @@ let pname = "trezor-suite"; - version = "24.5.4"; - name = "${pname}-${version}"; + version = "24.6.2"; suffix = { aarch64-linux = "linux-arm64"; @@ -17,24 +16,23 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-gkN6e4Ndc96FT6vaCmSxuViTKuOc5vnCqptPN8IRno9Nv8L0k6hB7O+0g5E+9hd+3o5WASXKefYIOZAnPI3RZA=="; - x86_64-linux = "sha512-uHMI0fm02XdOyt6mAXEZuTZkNlNykTQbJNeGATBrlLLR98cxrOj8DQ1S7gPd5dkQCJzdmR7ydylj/XPOHsV2Ug=="; + url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; + hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA=="; + x86_64-linux = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources cp -a ${appimageContents}/locales/ $out/share/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix index 6d8a5f2bda..1b960265c6 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "greetd"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "sha256-QFxE5c4XDOBa3rKpUFur6xOG+5m0NSCOWo7960ZWEow="; + sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; - cargoHash = "sha256-w7V5ZBFy5MIEQKOPPgsc7XnrXsF5rEDNzUKeLPPy4P4="; + cargoHash = "sha256-M52Kj14X+vMPKeGwi5pbEuh3F9/a3eVjhsbZI06Jkzs="; nativeBuildInputs = [ scdoc diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix index 40b52ecf75..e963a409ad 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/apognu/tuigreet"; changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ luc65r ivar ]; + maintainers = with lib.maintainers; [ luc65r ]; platforms = lib.platforms.linux; mainProgram = "tuigreet"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 74f7d3c8f7..09bc0d4321 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -17,7 +17,7 @@ , gnugrep , gnused , gnutar -, gtk2, gnome_vfs, glib, GConf +, gtk2, glib , gzip , fontconfig , freetype @@ -175,9 +175,7 @@ let # For GTKLookAndFeel gtk2 - gnome_vfs glib - GConf ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index c2bc17f869..163948c90d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -1,11 +1,10 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }: +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { fontDirectories = []; }; - inherit (gnome2) GConf gnome_vfs; inherit buildFHSEnv; inherit tiling_wm; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 9550969adb..192320fab6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -66,7 +66,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index a3d729b636..3e8ab4625f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -143,7 +143,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index b85128816a..944fc6c494 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; + rev = "9e88e660d717ba597d9fe9366cf4278674734410"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240622.236"; + version = "20240629.1404"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; + hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA="; }; commit = rev; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb45c38348..1e9a8191b3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -508,14 +508,29 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; - preBuild = (old.preBuild or "") + '' + preBuild = (old.preBuild or "") + + (if pkgs.stdenv.isDarwin then + '' + export MODULE_FILE_SUFFIX=".dylib" + make lib + mkdir -p /tmp/build/rime-lib + cp *.dylib /tmp/build/rime-lib + '' + else + '' make lib mkdir -p /build/rime-lib cp *.so /build/rime-lib - ''; - postInstall = (old.postInstall or "") + '' + ''); + postInstall = (old.postInstall or "") + + (if pkgs.stdenv.isDarwin then + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib + '' + else + '' install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so - ''; + ''); }); shm = super.shm.overrideAttrs (attrs: { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/linux.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/linux.nix index 1effb9def0..d9f0391ba8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -16,6 +16,7 @@ , python3 , autoPatchelfHook , vmopts ? null +, glibcLocales }: { pname @@ -112,6 +113,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JAVA_HOME "$jdk" \ --set-default JETBRAINS_CLIENT_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \ + --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json index 5078fb22ee..fb09af6272 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,10 +3,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "96f90b3898ce1393381f4ba4a46356b07993bb44e09680df383898bca3f508a3", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3.tar.gz", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "4c7a0de431e93af748d1b695952809d4de43d9185d26c115c29aad683f511b8e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.tar.gz", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -19,10 +19,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "5013b652c4bb7c8be3e8b518f3d7acd83c4d1c371c8703e6bcfebec7854d4c28", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2.tar.gz", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "aee5e18c44b9ed4e5c3ac13c0f2c8e5765105e7c12a8553e85ea8e64d5bb3d8c", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.tar.gz", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -35,42 +35,42 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "9937511083ab4bc0fb83463d1e0e7f2b054856c1e2064f43a7b1bd9ad899e3b3", - "url": "https://download.jetbrains.com/go/goland-2024.1.3.tar.gz", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "f982476c9d870f1f354ab15135094cbde5c25c851ec21f424d0cd24149a12be6", + "url": "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "d2ae9701c948f77464415928891446e83e31abd3275a0d331febb7d58e1e1b97", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "7d5e4cdb5a7cb1c376ca66957481350571561edadc3f45e6fce422e14af0fc16", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.tar.gz", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "358ddba5a187cb900efff7df06b1ffdda5a16d1e12cdf49328db486a066f6352", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "cda20bbbc052c2b8e87ea8607235ee0f7b5775728e8648c0a603889a3efa685f", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "version": "2023.3.1", "sha256": "52a40fe05dd8d53a3f68faa7a6e40b73f72f80db5976d8ebd781955493a65fe1", - "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.1.tar.gz", + "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", "build_number": "233.13135.1068" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "d785599f7d6bfdfb746eec68d5e606fe6df370909138243c35c549b574759432", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3.tar.gz", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "c6a9b57ecd8f588af512a1cba389738bd461531cab4f984ed9758abfdada822d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -92,34 +92,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "9cb256e2c12c493a5bbb7c84a44aa618732c67a137fa0eddb748a777e25b29d5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3.tar.gz", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "e277c2636383c023f00bd7833be86ffe1f8f67cf98cb719bbb4293aa42ba8ad0", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "e732aaf0dc07aaef7b9bff08d8335ed5361ff179f4e50f5cd6433884527fb452", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3.tar.gz", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "84b96e1f6cdbb5497fcce1a036044e5c51002006ac8926be72d37ec48b1ceb52", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "a0abd85542dd02d82f6adeabd4fa819731003883f0b6cac8a86f421f2a6f1c39", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1.tar.gz", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "68a94f4d57ca937629f825be9c1375328b4fbf50c4bf0561d1b9b8db04102a62", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.tar.gz", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "d22f38c8c02520deef21a57f3c85800dcf44a2ace8174a6dd0daa0a2789d5657", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4.tar.gz", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "339ac8fc3ecc20afdef05b1782cb861d52eb09336d6a20cc4aa487c1bd108522", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -134,10 +134,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "0609fefc65d5bafcb4fff54d9c4b135ec305d058dc3f350f659c6389bf944eb9", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "1e707c5409fd4a8490893ce23ff427d8e96d2cb6c31f1457a363e3127f0d1319", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -150,10 +150,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "d5060ecc3909f8e21a8b29224c16f874c3c634ae7ca4c649821c467d744a556c", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2-aarch64.tar.gz", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "d7d7647e2e6c398148d87690c0224cac2212bb56e1c9d802bd79748df77f1b24", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.tar.gz", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -166,26 +166,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "b8caa2618cd85c4bc3a4d95c6f1ec4207f93e754048fff571f1d667536512e45", - "url": "https://download.jetbrains.com/go/goland-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "b5b9efc087c71369c85080b9159e268bcf16a493e69e359b67108f71a474dd61", + "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "d484fe1eac4b08109880ce207d208dec19782ee786fd393c19caa2dc31abbc1f", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "d4991c6041bfbe9958b55e876a45672d90ddcaf7aae18ac1c9134747a102eddf", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "0d913b3d78f254e13ee3edf0f868067eebdb586f25cb3be439b8067e0d5689fb", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "35057b24047c719102f08a22754bba1c66098f0d410b21ab178d7b6b9a8f7882", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -198,10 +198,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "4c9637be78764d7f41394a23a1477c42346f3211a9f31683f3beb7dbeef700e7", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "45a11309799d23b1638a87ee4580bd5e8d4f50ea07d5467e99e416ae45a23b06", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -223,34 +223,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "8991e31b3edc0a4347a9711e4f7267b91d3176d47abfa4f560d83d214ba70ff0", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3-aarch64.tar.gz", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "e0f8ac64b87c093c7f97ea6ee340c7f518d14d4c68c17d0a2b7a9f079d2fcd62", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "420dfd86a2f6964ab47c38addc65cb71178dc14092a25c0df2c3635e1b6c5896", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "b4d51afd0cf8ef19e6eae5a401836a89164215cf532a08a33824895229dba321", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "aa19d94bbe8618cdf6e3f18163dc9537cfac454fc2e4ff4f01c11dd98cdd6a89", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "a6abde77ef84f10d342b57c3f6bff84d0b973d8265c2baeb2490fc36dbcca13f", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "a0d8462ecdae484b42f87729fe9d16283a1ff4375e0a7079d06e56a9c6b6ef09", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4-aarch64.tar.gz", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "20db531cecada0fdd1947234ac120d0cf2a40037a3af825f1cf2ac066709fb44", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.tar.gz", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -265,10 +265,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1.3", - "sha256": "b08fb203c870c79a7778e44292968656e711416b985d6c60ed46dc1d6d0269a1", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3.dmg", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "1d1d03a19aba6f941703ca5724317464e670a1ab63d70882448cf0364bc13c8b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.dmg", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -281,10 +281,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.1.2", - "sha256": "5284682b7446ec3328e73dd16d6c11c331487fd21a20029c8b9ddb38c7d00968", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2.dmg", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "132c1e67c18d676844a26ad95fcd68942965157222f7dc931c15117e96d29a84", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.dmg", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -297,26 +297,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1.3", - "sha256": "086a84677a4d72712673206a35d5d75dc793c8753fb92bc82b3410ca6356d2f7", - "url": "https://download.jetbrains.com/go/goland-2024.1.3.dmg", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "e2b2ae8d52700335d539b28179410b2567c78f6c8121a742e4df208180b55884", + "url": "https://download.jetbrains.com/go/goland-2024.1.4.dmg", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1.3", - "sha256": "8ad56d0c4517bdcfb8e970cce1d8e1b44672454eb658e14d452ee59bb5659a56", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "2420493df5796e47836d3dfd579006f25aa88f1252db4fd6999591529022e925", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.dmg", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1.3", - "sha256": "338dc0847fb71d3d83cef52705439f86a37052fae737cf9d36f01a2d27e40ad2", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "30396377e163ba7f8d5c4ef112e9c8abb064897dd337f059357feecaa6c53b6e", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.dmg", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -329,10 +329,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1.3", - "sha256": "68403a8f6afd6d0a13355dd6ea8b333a1fd785fd1422fe902105d3c02359ee04", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3.dmg", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "ce844a947a96d819a59b35705fd1007c5193a444c3bb5d237179bfb3ceb2ed8b", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.dmg", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -354,34 +354,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1.3", - "sha256": "54eccb5d26825ae5022ab57207197f4fea68a02a0e6c4dceb3c79ce81750b1e5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3.dmg", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "2fc9e3063278e510b28eea0b2823b0c2309d08728d53261b48cbac093255cbfe", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.dmg", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1.3", - "sha256": "ed9c8bd4fcc4e9756f60f44d4cbb74b47031cee52503f5dc869e98b1be988d9d", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3.dmg", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "a4619da76349319b45a7bacbc49c3c53b8bd0769692e30f84f78a5c61ccd552b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.dmg", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1.1", - "sha256": "e7b23829baa464de3456757a880a8daf364c867c23a7ce1c126b1b210cdea400", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1.dmg", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "d937f1f8eb6a7d0ce35218a616d6e7e237b86c7fdb9562b2ff3213ad3c3730de", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.dmg", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1.4", - "sha256": "d4a8a990f92a183911dd6f7a75c671b9851d77e9e269e9e2bc5e6973a0b9f691", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4.dmg", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "45475fda7a66ba5da23091a7d9ec3314c9482b0a31fe9cc40a3a02f243c86e48", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.dmg", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -396,10 +396,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "0d9e1267ac09a6384eba29088e627219fd00586c1055a1c2f46d1da10f1da467", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3-aarch64.dmg", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "9eed7144d482a4fc9d6cc639c04c0b99cc6831aa73c5998ac9d1e1bd23f7ab66", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.dmg", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -412,10 +412,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "ee69b1ed4ebfe1f4f41e6d617d4ccc8ac2d9a484dace45f2a3c0532a4a091ae2", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2-aarch64.dmg", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "fa8f9c77b2fab31ea383a492c7a061e4b297e6581df4a5c116de9aec4a52c86d", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.dmg", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -428,26 +428,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "9b4dc9d1374178b2f8f0a30004afc9c1ef2d009441d3e096a76bda7456758522", - "url": "https://download.jetbrains.com/go/goland-2024.1.3-aarch64.dmg", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "6dd71b3993b005e3557ad6ddb4d9ed87068be5225df19422e4b0e3fdd0fbbd10", + "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.dmg", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "0b51284ee1e1e1390f9bce1211ee8b48b03b4d5d2394fb7180b12f80a7817d63", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3-aarch64.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "0c2e9a534d8f84acf8a17412d73e3f161864268acefee5130259489e2575d246", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.dmg", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "43fccfb343c69529b97a048adfde577d3ad3ee701240a2c9cace6936f4cd356d", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3-aarch64.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "0d6dd0ebc97a61920721fb6c9663a905df1edea976f62b32bdf8ff879c02c7d0", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.dmg", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -460,10 +460,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "e4b767f5348fc3854ffc057baeffcd10c0c293b5aa3cbeeb2d2e7bd14531a4bb", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3-aarch64.dmg", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "8e5bffb20b1606195afe6818429e99b31c56f2e8f390c81cd6d92ff3de80de68", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.dmg", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -485,34 +485,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "ecde83909aff440727db6641c3f071c06e35b06e2148703ffa4ff270670469e2", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3-aarch64.dmg", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "0682ca85bb61534e39426d9f397eeb3c383dfd0a2e9dc4e8052d9e6408741fdb", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.dmg", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "a26d85b37141a4daacb0afbc58f269fdb5a5fbb49861a9881779e4b906a85ffe", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3-aarch64.dmg", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "ad3ebd40266f40f5aadb152fc5e845bda1eb8de75923cf598072458dc92b8194", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.dmg", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "955a2da9eaa21593e457555653c1945c87a7b629b1a74d9e86f53a025e94c5ba", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1-aarch64.dmg", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "af973b73e5ced9982703d7f5d163e3bd8bee8b095aac16b2151ec2c7f1d4d870", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.dmg", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "37eaeeaf614e43215782c5af844e3df993cdc50e1370f5a6ecde562b3052218b", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4-aarch64.dmg", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "e55e4671316ad2c2bfc5564516e261b59d139267c18d06d7a62b8f665d86da5e", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.dmg", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index 2441c8a545..00b2794a13 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", "241.17890.14": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", "241.17890.24": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/631/552809/python-241.17890.1.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip" }, "name": "python" }, @@ -58,16 +58,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "241.17890.14": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "241.17890.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -89,16 +89,16 @@ ], "builds": { "233.13135.1068": null, - "241.15989.206": null, - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, + "241.17011.169": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "kotlin" }, @@ -120,16 +120,16 @@ ], "builds": { "233.13135.1068": null, - "241.15989.206": null, - "241.17011.166": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", + "241.17011.169": null, "241.17890.14": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", "241.17890.24": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip" }, "name": "ini" }, @@ -151,16 +151,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "241.17890.14": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "241.17890.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -170,8 +170,8 @@ "phpstorm" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" }, "name": "symfony-support" }, @@ -181,8 +181,8 @@ "phpstorm" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, @@ -192,18 +192,19 @@ "datagrip", "goland", "idea-community", + "idea-ultimate", "pycharm-community", "rider", "rust-rover" ], "builds": { - "241.15989.206": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", "241.17890.14": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip" + "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip" }, "name": "python-community-edition" }, @@ -225,16 +226,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip" + "241.17011.169": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip" }, "name": "asciidoc" }, @@ -255,15 +256,15 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "-deprecated-rust" }, @@ -284,15 +285,15 @@ ], "builds": { "233.13135.1068": null, - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "-deprecated-rust-beta" }, @@ -306,10 +307,10 @@ "ruby-mine" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", "241.17890.14": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" + "241.18034.61": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" }, "name": "ide-features-trainer" }, @@ -331,16 +332,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", "241.17890.14": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", "241.17890.24": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" }, "name": "nixidea" }, @@ -350,8 +351,8 @@ "idea-ultimate" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" + "241.18034.61": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" }, "name": "go" }, @@ -373,16 +374,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", "241.17890.14": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", "241.17890.24": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -403,17 +404,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/11349/556097/aws-toolkit-jetbrains-standalone-3.11-233.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip" + "233.13135.1068": "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip" }, "name": "aws-toolkit" }, @@ -435,16 +436,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -466,16 +467,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -497,16 +498,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -528,16 +529,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.206": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17011.166": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.1": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.169": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "241.17890.14": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "241.17890.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.8": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.18034.45": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.50": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.63": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.69": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -558,17 +559,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip" + "233.13135.1068": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip" }, "name": "github-copilot" }, @@ -590,16 +591,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "241.17890.14": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "241.17890.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -621,16 +622,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "241.17890.14": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "241.17890.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -641,9 +642,9 @@ "rust-rover" ], "builds": { - "241.15989.206": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip" + "241.17011.169": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip" }, "name": "rust" } @@ -651,8 +652,8 @@ "files": { "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip": "sha256-P8AFMVp/rFi7zTh9f/i45q/QalvI37itnK57Dz/W/z4=", "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=", - "https://plugins.jetbrains.com/files/11349/556093/aws-toolkit-jetbrains-standalone-3.11-241.zip": "sha256-wFC3nKCCHRxxAmhxF66BtuNrzXUByG7jfG6cVs2TqXQ=", - "https://plugins.jetbrains.com/files/11349/556097/aws-toolkit-jetbrains-standalone-3.11-233.zip": "sha256-78N3rm1l4l1OJpT1tg1cASOBc2Wt3IXs0hdjOtdF/Xg=", + "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip": "sha256-Cc87UUI1dAFqmmydPRAcirlF2kF1v1sMcYMdHVZ5lK8=", + "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip": "sha256-uk9DVZ7K+EwkoNubC5eoVwxlvYCd7KVTl90zJsKc4r0=", "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", @@ -661,21 +662,22 @@ "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", - "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip": "sha256-p2xY8eN3tOvlXhuZm4R7zl67lnKbaJwKwPZSolDTaX0=", + "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip": "sha256-4bYtBaLvcXZv8eVfG09ywSbcP+7SUb4j+NZ5mb2aluE=", "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/542571/intellij-rust-241.25989.199.zip": "sha256-ACeMU2llicj8VHBJJSAk2SIQaZrD2ykmY0b3VDiedV4=", - "https://plugins.jetbrains.com/files/631/552809/python-241.17890.1.zip": "sha256-ASnW9SteKd88h2tAuZSHjnK+NMV7lm/3MN1tMqRvtmg=", - "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip": "sha256-6EU2ExUMvXG2pJ77ZgZIsPC6gWX8MTZB0rRttYNRfX4=", + "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip": "sha256-7rbYfO5CUvsW3HXWmEadreKbhJhX6joX15miODb2N+4=", + "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip": "sha256-DnjjUcwRL9dbNrHTnZacQYPE0biRFLmq6lR2ApRGgXI=", "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip": "sha256-7JQpKNttNfTvzfZ2Qj42FZAtSqx6GjWHhT0WRecK3tc=", + "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip": "sha256-85KeM0H3Jw8WP6LjKf1L7mIRXxnTR3YUCT6xUduAN/s=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip": "sha256-92uUIFz5kEjrbgPnomi0VXc9Du17evzGsO5ApsrtHrA=", "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip": "sha256-VJWFzUk/lloFCfHbXX7lQRV6bGseCqEPA8XOLlkqNho=", "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip": "sha256-UrvhbGhcqxGke5tZTktyaWVYIWO5NhOU/WiswMYr83Y=", "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip": "sha256-njHcuJmpc/5JsfZ6mmjcRK2j78J0E4bu68T1A0DNdVU=", + "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip": "sha256-icVvR79Ut6RopPKqvUQf4ZHKg14LV8/KWUZfQh/BYV8=", + "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip": "sha256-p26GW1NyVI8OR1VypeWUFWW8qlwB+LtzrEoKyXBwiCw=", "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip": "sha256-oP/tvAqzMSDLJ0Jah1eLJDZIm9WhOZas7lPWrvjWFMM=", diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 8f9a5b8800..438c990482 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -7,7 +7,6 @@ , ruby , lua , python3Packages -, writeText , wrapNeovimUnstable , runCommand }: @@ -78,7 +77,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; # as expected by packdir packpathDirs.myNeovimPackages = myVimPackage; @@ -101,13 +100,13 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; - manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + manifestRc = vimUtils.vimrcContent { customRC = ""; }; # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent ({ + neovimRcContent = vimUtils.vimrcContent { beforePlugins = ""; customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); packages = null; - }); + }; in builtins.removeAttrs args ["plugins"] // { @@ -225,8 +224,25 @@ let } // grammar.meta; } '' - mkdir -p $out/parser - ln -s ${grammar}/parser $out/parser/${name}.so + mkdir -p "$out/parser" + ln -s "${grammar}/parser" "$out/parser/${name}.so" + + mkdir -p "$out/queries/${name}" + if [ -d "${grammar}/queries/${name}" ]; then + echo "moving queries from neovim queries dir" + for file in "${grammar}/queries/${name}"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + if [ -d "${grammar}/queries" ]; then + echo "moving queries from standard queries dir" + for file in "${grammar}/queries/"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + echo "missing queries for ${name}" + fi + fi ''); in diff --git a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix index 837648a40d..b60b421e51 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk="; + sha256 = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 9c31bcdebb..c3d4eb6824 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-oPC0HJgBWCAGZ1pVTiHyDO3NQ3u/+1fA2KrxuBCB+IY="; + hash = "sha256-gW7LXfXeZ0nXyWchVRyVDDJi725xa4tgYWYnSIhi5Bo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix index ff198df57f..060c30a171 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix @@ -15,13 +15,13 @@ crystal.buildCrystalPackage rec { pname = "tijolo"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "tijolo"; rev = "v${version}"; - hash = "sha256-+sRcS5bVH6WLmSDLiPw608OB6OjBVwLqWxGT5Y6caBc="; + hash = "sha256-RVdZce9csnhJx5p+jBANDCsz2eB/l3EHExwKMbKL9y0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index 4a57523f1b..a93a25b886 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Ykr60u2t5cyIZdpFHiRirXg2FqSLCzJzsdvw6r/LK8="; + sha256 = "sha256-cFS1OSYfGMsnw+VkZD/HO4+D+pxNKuifWjNhy0FoxN0="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix index 9445f422de..30600de859 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -22,10 +22,10 @@ let pname = "typora"; - version = "1.8.10"; + version = "1.9.3"; src = fetchurl { url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; - hash = "sha256-5ZLSzDUcF0OZUuWVX/iG+4ccTlCPdYxy7zl0wDHlxNQ="; + hash = "sha256-3rR/CvFFjRPkz27mm1Wt5hwgRUnLL7lpLFKA2moILx8="; }; typoraBase = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 1a5d3f5004..f6809c3db6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -10147,14 +10147,14 @@ final: prev: specs-nvim = buildVimPlugin { pname = "specs.nvim"; - version = "2022-09-20"; + version = "2024-05-19"; src = fetchFromGitHub { - owner = "edluffy"; + owner = "cxwx"; repo = "specs.nvim"; - rev = "2743e412bbe21c9d73954c403d01e8de7377890d"; - sha256 = "1ycqvxrn13bfimf9k03bmm1baml8gyq5lxqjxh1fya44s2bg714r"; + rev = "dd82496f538b688cedf98429f89fef47ecb0625e"; + sha256 = "0427fx6iw3i2y9ny3sz1na32bxcj8i93dbm93ckxf3bii8zqjs0s"; }; - meta.homepage = "https://github.com/edluffy/specs.nvim/"; + meta.homepage = "https://github.com/cxwx/specs.nvim/"; }; spellsitter-nvim = buildVimPlugin { @@ -17515,5 +17515,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + Preview-nvim = buildVimPlugin { + pname = "Preview.nvim"; + version = "2024-06-01"; + src = fetchFromGitHub { + owner = "henriklovhaug"; + repo = "Preview.nvim"; + rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e"; + sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU="; + }; + meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/"; + }; + } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 1eb3250113..727962f834 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -79,6 +79,8 @@ , CoreServices , # nvim-treesitter dependencies callPackage +, # Preview-nvim dependencies + md-tui , # sg.nvim dependencies darwin , # sved dependencies @@ -1229,6 +1231,10 @@ dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; }; + otter-nvim = super.otter-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + overseer-nvim = super.overseer-nvim.overrideAttrs { doCheck = true; checkPhase = '' @@ -1271,6 +1277,15 @@ nvimRequireCheck = "plenary"; }; + Preview-nvim = super.Preview-nvim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; + mdt = lib.getExe md-tui; + }) + ]; + }; + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = with self; [ cmd-parser-nvim ]; }; @@ -1344,12 +1359,12 @@ sniprun = let - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-PQ3nAZ+bMbHHJWD7cV6h1b3g3TzrakA/N8vVumIooMg="; + hash = "sha256-9vglmQ9sy0aCbj4H81ublHclpoSfOA7ss5CNdoX54sY="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1359,7 +1374,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-I8R2V9zoLqiM4lu0D7URoVof68wtKHI+8T8fVrUg7i4="; + cargoHash = "sha256-p4rZBgB3xQC14hRRTjNZT1G1gbaKydlKu6MYNSLk6iA="; nativeBuildInputs = [ makeWrapper ]; @@ -1381,6 +1396,12 @@ ''; propagatedBuildInputs = [ sniprun-bin ]; + + meta = { + homepage = "https://github.com/michaelb/sniprun/"; + changelog = "https://github.com/michaelb/sniprun/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; }; # The GitHub repository returns 404, which breaks the update script diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch new file mode 100644 index 0000000000..e8082f51c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch @@ -0,0 +1,22 @@ +diff --git a/lua/preview.lua b/lua/preview.lua +index 6d9875d..729cc70 100644 +--- a/lua/preview.lua ++++ b/lua/preview.lua +@@ -28,7 +28,7 @@ local function open_window(file) + vim.env.MDT_WIDTH = width + + vim.cmd.vnew() +- vim.fn.termopen("mdt " .. file) ++ vim.fn.termopen("@mdt@ " .. file) + + vim.cmd("setlocal nonumber norelativenumber") + vim.api.nvim_feedkeys("a", "t", false) +@@ -49,7 +49,7 @@ end + function M.setup() + -- Check if "mdt" is installed + if vim.fn.executable("mdt") == 0 then +- install() ++ -- install() + end + + set_cmd() diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index c31ea3ee4d..75dd02f396 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, https://github.com/chrisbra/NrrwRgn/,, https://github.com/vim-scripts/PreserveNoEOL/,, +https://github.com/henriklovhaug/Preview.nvim/,HEAD, https://github.com/yssl/QFEnter/,, https://github.com/chrisbra/Recover.vim/,, https://github.com/vim-scripts/Rename/,, @@ -853,7 +854,7 @@ https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, https://github.com/ctjhoa/spacevim/,, https://github.com/chrisgeo/sparkup/,, -https://github.com/edluffy/specs.nvim/,, +https://github.com/cxwx/specs.nvim/,HEAD, https://github.com/lewis6991/spellsitter.nvim/,HEAD, https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 94d77cf65e..724e9004b2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -754,6 +754,23 @@ let }; }; + bradgashler.htmltagwrap = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "bradgashler"; + name = "htmltagwrap"; + version = "1.0.0"; + hash = "sha256-WOMfwxyeDLoSwF0xz9tbntDVrUWycJ4bW0rZjfLSzgM="; + }; + meta = { + changelog = "https://github.com/bgashler1/vscode-htmltagwrap/blob/master/CHANGELOG.md"; + description = "VSCode extension for wrapping a text selection in HTML tags"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap"; + homepage = "https://github.com/bgashler1/vscode-htmltagwrap"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -1156,6 +1173,23 @@ let }; }; + danielsanmedium.dscodegpt = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "DanielSanMedium"; + name = "dscodegpt"; + version = "3.4.10"; + hash = "sha256-zjaM9YME0wfBOwhJTacnQbQvw35QL5NvXIBAx5d/bjI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; + description = "Easily connect to AI providers using their official APIs in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DanielSanMedium.dscodegpt"; + homepage = "https://codegpt.co"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.onny ]; + }; + }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "daohong-emilio"; @@ -1506,8 +1540,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "14.9.0"; - hash = "sha256-Z6KeIUw1SLZ4tUgs7sU9IJO/6diozPxQuTbXr6DayHA="; + version = "15.1.0"; + hash = "sha256-xGgm/WNJDIh/Bs11fLYwHQ9ULiZBWbKw4QYl/l4KYJ4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -2516,6 +2550,22 @@ let jebbs.plantuml = callPackage ./jebbs.plantuml { }; + jeff-hykin.better-nix-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jeff-hykin"; + name = "better-nix-syntax"; + version = "1.1.5"; + hash = "sha256-9V+ziWk9V4LyQiVNSC6DniJDun+EvcK30ykPjyNsvp0="; + }; + meta = { + description = "Visual Studio Code extension providing Nix Syntax highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax"; + homepage = "https://github.com/jeff-hykin/better-nix-syntax"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + jellyedwards.gitsweep = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jellyedwards"; @@ -2770,6 +2820,21 @@ let }; }; + leonardssh.vscord = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscord"; + publisher = "leonardssh"; + version = "5.2.12"; + hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE="; + }; + meta = { + description = "Highly customizable Discord Rich Presence extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord"; + homepage = "https://github.com/leonardssh/vscord"; + license = lib.licenses.mit; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -3021,8 +3086,8 @@ let mktplcRef = { name = "compare-folders"; publisher = "moshfeu"; - version = "0.24.2"; - hash = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; + version = "0.24.3"; + hash = "sha256-eaumF2BIqEYoyL7LQ0Wx3+gkkFGpWKQoN3AisI8wTQY="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index b98c35a3f0..c6124344a7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -14,7 +14,7 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; + hash = "sha256-lpMwA5jMr10uV4uIjq9VNOKjqduxXuDZVIIszVIXSGw="; binaries = [ "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" @@ -24,7 +24,7 @@ let }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; + hash = "sha256-OaA3uNvKwbRGqMQqg6YozQF6AXxisO9ndDAFBj7wUEM="; binaries = [ "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" @@ -34,7 +34,7 @@ let }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; + hash = "sha256-o6B6eA4LqoLw1aGvUI95aK3pChyFXK3jUOH5Fpp4/IM="; binaries = [ "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" @@ -44,7 +44,7 @@ let }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; + hash = "sha256-cDv1l57C73UEtSJhTO+xb2sSX8xwepzJYxYuGsNq+r4="; binaries = [ "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" @@ -59,7 +59,7 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.4.28"; + version = "1.7.27"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 189804e981..2cbfa504f4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -29,22 +29,22 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; + hash = "sha256-Y+Re3tDX8HQrWo045JxdX8Jt4jomm1/C9T+BU2/hE+g="; binaries = linuxBins; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; + hash = "sha256-nFCFK2GVLljMqmxJnlma6kAXHc9qN/DnnRiWrkjmLmo="; binaries = linuxBins; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; + hash = "sha256-hC1ZJdBKJR3om9xuxEBhaBtQXEin1R0t7BFVdOUu6X8="; binaries = darwinBins; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; + hash = "sha256-mIZJXgACvJmhrJzOtKcF2DKeBkLSjKehE1xEwtp1X+E="; binaries = darwinBins ++ [ ".debugger/arm64/vsdbg-ui" ".debugger/arm64/vsdbg" @@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.22.3"; + version = "2.34.12"; inherit (extInfo) hash arch; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 99878c8856..8edde8c3d7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/third_party/nixpkgs/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-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; + hash = "sha256-tQjeKqNIhsf2nLdvncH1X6R9HiSTaizBtlAgrfAGtWs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 3461744ec6..c1f275b691 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; - x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; - aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; - aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; - armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; + x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; + x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; + aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; + aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; + armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.1.24165"; + version = "1.90.2.24171"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix index ade90d3885..f7fd332c7a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix @@ -18,6 +18,8 @@ , which , wrapGAppsHook3 , darwin +, vulkan-loader +, autoPatchelfHook }: stdenv.mkDerivation (finalAttrs: { @@ -38,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + autoPatchelfHook pkg-config which wrapGAppsHook3 @@ -64,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { darwin.apple_sdk_11_0.frameworks.OpenAL ]; + appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ]; + enableParallelBuilding = true; makeFlags = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index c9f1e1572a..589a09a6d1 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -190,7 +190,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ashkitten - ivar ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix index 8f426f9c52..ff1773a837 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { mainProgram = "flycast"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix index 7e00ad6a5d..4c545ac3b8 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/goldberg-emu/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { mainProgram = "lobby_connect"; license = licenses.lgpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index 249d3db287..4ab69d9f08 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -5,10 +5,10 @@ "src": { "owner": "libretro", "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + "rev": "5474ed1ab880b3296c9860d0943d7de1970c79dd", + "hash": "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc=" }, - "version": "unstable-2023-02-20" + "version": "unstable-2024-06-28" }, "atari800": { "fetcher": "fetchFromGitHub", @@ -35,20 +35,20 @@ "src": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", - "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=" + "rev": "d982616da671c3dd9c9271dd9d95c5c7d1393191", + "hash": "sha256-pAk5uLv5/2n3lZOWp5a5IdPqHM9vLacv8/X6wni5+dE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-ngp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", - "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=" + "rev": "09869bb6032610714e22d09b95a81ea291937a8f", + "hash": "sha256-chMtMPUMHQ0iVcERfQApKnGQmV822QkYce2wvSj2Uck=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-pce": { "fetcher": "fetchFromGitHub", @@ -65,30 +65,30 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", - "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" + "rev": "9ebf08571e20e79db32be78a025a8b552e9a3795", + "hash": "sha256-iE81/8RMkCaJuFOMSfZzCC7BFOFBv/0cNpcJRuQC0ws=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + "rev": "94541ff5bf9c474aa2923fed3afc4297678c9ede", + "hash": "sha256-+E09lQmogRvLc+6TzI0FNfu18jRdZMOzEYJnQjYuldI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "beetle-psx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", - "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" + "rev": "6f0ef7be0a023842b98ab5a8e7c7b5e4b2c31573", + "hash": "sha256-5jYDNuW0XjWTHTEEUkxK0DnQgvH2dZLUot/lmix05hk=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-29" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,30 +115,30 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", - "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" + "rev": "0e6ce96d68c1565d1cfb2d64841970f19f3cfb66", + "hash": "sha256-4LEvzyIpWBH0jfTuJaRxYe1fKdrw7/Mes6UlkxNyS58=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-vb": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", - "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=" + "rev": "4395c809d407c8b5a80b0d0ee87783aad5fedf8f", + "hash": "sha256-lO4tbJeQIZPGhW0Ew0BOcfbwNeV+yR8PTZ/RyCIt14s=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-wswan": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "32bf70a3032a138baa969c22445f4b7821632c30", - "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=" + "rev": "440e9228592a3f603d7d09e8bee707b0163f545f", + "hash": "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "blastem": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "9131a4c705e18f7b96e7dbfcfe70b158d10afed1", - "hash": "sha256-NotqQMBHV6E3LSXJHQ5FqIbq2OQbXx6xCbLYV9g12kQ=" + "rev": "c5963607b59c8d56d28bb4de3f7ac555e004c69e", + "hash": "sha256-YmOy2iaQYqaIp4u4cIQx8Z8jUqaIhPdJZTFgSETQprs=" }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-06-21" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c", - "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc=" + "rev": "00e3ed7e361afbab03363e493f5aa643e0bb2577", + "hash": "sha256-w57U5W4m8AZFujiY3L2uUFZQ7NsRzMU9NRPUerJk/9A=" }, - "version": "unstable-2024-06-03" + "version": "unstable-2024-06-29" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -267,10 +267,10 @@ "src": { "owner": "libretro", "repo": "81-libretro", - "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", - "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=" + "rev": "c0d56c5bc5cd48715b4e83cbb3d241a6bed94c2a", + "hash": "sha256-XkXZlH359NtOemkArSc1+UXhU55W3hVeM7zH/LRr1zo=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "fbalpha2012": { "fetcher": "fetchFromGitHub", @@ -297,31 +297,31 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", - "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" + "rev": "9e685cda1372204048d831ef5976972dfb2dc541", + "hash": "sha256-O+FEHPuXybyMCMdvm9UdrZvl5K1yiFx2HIyhN3AuyVo=" }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-28" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "ca613db70d8897e06562fe089e3e9543b41526a0", - "hash": "sha256-wYKHC+EvLnq+PnL1/hNcrhDyCY+4kaiSjIUKJ9SGPHc=", + "rev": "7d645541f8f8b7f4550eabe9157d8fb82b43c1a7", + "hash": "sha256-/RLh6FO3lk6L1yhTMGLt7sjY/vwlb1y2XxmtgO5+uOk=", "fetchSubmodules": true }, - "version": "unstable-2024-06-11" + "version": "unstable-2024-06-23" }, "fmsx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", - "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=" + "rev": "cf97a3c6da07d5f8e98c90c907ad987ffea432e0", + "hash": "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA=" }, - "version": "unstable-2024-02-08" + "version": "unstable-2024-06-28" }, "freeintv": { "fetcher": "fetchFromGitHub", @@ -348,50 +348,50 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "863002046a812758da6064daaf579fef1cec19a3", - "hash": "sha256-7rkyMcaKDNOESNrmwYCKM71x3WM8eSN9LBX0xOQRhJ0=" + "rev": "5d47507d3e25354478b216111b30741868d0362b", + "hash": "sha256-PkvV3ALtC53v+Te9lGuUWeOfXr8CZSxCdClgS59vpns=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-29" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "4e54d585d540d461ecc412c91ca4a79e2338f3b6", - "hash": "sha256-7P6w6pXplOfpP7w+JztNd49FdKBPM8eQeSh93YAG0Y4=" + "rev": "5355eae2e1c70893a14ec0fda68de4e49cd5a0d5", + "hash": "sha256-134J1ifF9EOaPk6qqANdJawVtoa1M91Bc5jqxA0hMOM=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-29" }, "gpsp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + "rev": "bfbdfda215889cad5ae314bd5221d773a343b5bd", + "hash": "sha256-l3hr5c7kIgr7Rjfneai6cTpUswMpba51TlZSSreQkyE=" }, - "version": "unstable-2024-02-10" + "version": "unstable-2024-06-28" }, "gw": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gw-libretro", - "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", - "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" + "rev": "feab76c102166784230dc44c45cad4cb49a1c9a7", + "hash": "sha256-dtcsPTemFqgfBtFp4RF0Q2B/3bCHY4CqJGibwV+lfwI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "handy": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-handy", - "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", - "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=" + "rev": "15d3c87e0eba52464ed759d3702d7cb7fdd0d7e0", + "hash": "sha256-aebQGTGYF1jlZdSzb3qQ6PIyQZ00hEKfH6W6pYYQUBw=" }, - "version": "unstable-2024-01-01" + "version": "unstable-2024-06-28" }, "hatari": { "fetcher": "fetchFromGitHub", @@ -429,20 +429,20 @@ "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "ce82eaa30932c988e9d9abc0ac5d6d637fb88cc6", - "hash": "sha256-vCqv2EhgYtJwNE2sRcs8KTg0cGlRSmhykRLkt8mUKlg=" + "rev": "c8f28b100851fa850e2be3b8b30e2839a2d175cc", + "hash": "sha256-IQ6s6mOMMHX8GjNNfc0pZFjSZyJurpm40FHcyErfOPM=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-29" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "ecd00b18187c7fff75b6d9a70ac1b349e79652bb", - "hash": "sha256-1dVNNlDKDJwGHou/bY/grj/p9BJmfUwDxEiw2zQ7gSg=" + "rev": "015fbd88bfd92c3847749fee01e8725f53c007ef", + "hash": "sha256-6wzi/r9bBKzxMmXQ4mHSzlnI5D9l87BuhHwM7HTvGr4=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-30" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -540,30 +540,30 @@ "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5d2ac21adb784ad72d6101290117702eef0411dd", - "hash": "sha256-PKjnoTioAvCYv2JBiPMXR4QZUgPeSQ3V4cB7mp2fqeI=" + "rev": "147dc7e552b84d5c51d09108fa5ada0268710170", + "hash": "sha256-qsjoal3r/4QRJ0B5FcupZBhf9gyeIfok5cxsjeNJhrM=" }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-28" }, "neocd": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "c5a266254ffbaa2730d2814195f60e7be153fc86", - "hash": "sha256-MJhUYFNrtt2SSLun75OXKrT7nZzLBtyslqG9mziQuRk=" + "rev": "f87ed9eb4a7bf1243f031044c4e2ae1a7bf7100b", + "hash": "sha256-DqXYMno+NGIZrE1Q0y0WYR/jnjjHMfVT6lasLG4ew9A=" }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-06-22" }, "nestopia": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "nestopia", - "rev": "b99ede358b2219602443e7f414eabf81e17da244", - "hash": "sha256-iciidNkOhie3qJO8D4yB081ywfQtGGMrKBWFmBpps9g=" + "rev": "be1139ec4d89151fc65b81a3494d2b9c0fd0b7dc", + "hash": "sha256-8MoEYcywnqNtn4lntp8WcIYMTzKhaHkHyDMHMhHHxxg=" }, - "version": "unstable-2024-04-07" + "version": "unstable-2024-06-28" }, "np2kai": { "fetcher": "fetchFromGitHub", @@ -581,20 +581,20 @@ "src": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + "rev": "11fc0892dc6b99b36ecf318006834932cd5b817a", + "hash": "sha256-PlU3op50yPgDUXZxSOlltMf/30JLrotpp61UHK1uKB8=" }, - "version": "unstable-2023-02-21" + "version": "unstable-2024-06-28" }, "o2em": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "44fe5f306033242f7d74144105e19a7d4939477e", - "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=" + "rev": "c8f458d035392963823fbb50db0cec0033d9315f", + "hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=" }, - "version": "unstable-2023-10-19" + "version": "unstable-2024-06-28" }, "opera": { "fetcher": "fetchFromGitHub", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "330fa5efd306ad116c44faf6833a8108ed4144b0", - "hash": "sha256-pltPoWfXFh9OhWnQ+XMhHVZCo6BCGr6jCDhiL5T7LNM=" + "rev": "dfc8d55686a364cad85411dabb76c7fb94acd730", + "hash": "sha256-ngENgmBQFHUYRp9DBnQLWapvfhnFra/B+jeegm8+rtE=" }, - "version": "unstable-2024-06-10" + "version": "unstable-2024-06-18" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,21 +631,21 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", - "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" + "rev": "459f02ad03fa10b5c403fed724d47fe5adfd5fb1", + "hash": "sha256-bM2o6ukVXyrH9QnczHUtZCLu6Kwl6Gc9DriLvVHJmXw=" }, - "version": "unstable-2024-06-17" + "version": "unstable-2024-06-29" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "535217f16bc2848ec70985c41e1d131709352641", - "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", + "rev": "d6f625a1251c78caf6f2dc81c1ffdb724587bb24", + "hash": "sha256-3RjPYXVfv1ts8Khl/9hkWMdYalNoQmHb+S8xgNfstpo=", "fetchSubmodules": true }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-30" }, "play": { "fetcher": "fetchFromGitHub", @@ -663,31 +663,31 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "cfcca0ed13ca86eb6e1ee7bb4161aabee6c2af06", - "hash": "sha256-K96Ajh/jXxILiKXBaTiNh6FwptPQQG39jGq45aQ7veY=", + "rev": "c737eca1a7a0628523bcf710e2fa0a4288c31352", + "hash": "sha256-RSPyxhw27qL7FMgNqoGLGRiVue+BPB/huA2SvMMES+w=", "fetchSubmodules": true }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-06-29" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "9d412db570d3291829b308e6d1ac17f04acdda17", - "hash": "sha256-50Nl8IyaQRLOQtTRYhJFwTH8ojMxNVVn/c+oGCeJts0=" + "rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4", + "hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY=" }, - "version": "unstable-2024-05-23" + "version": "unstable-2024-06-28" }, "prosystem": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", - "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" + "rev": "a639359434cde73e6cdc651763afc587c1afb678", + "hash": "sha256-rcn1puMQXCKogONe2oUpcDEj8S6/oVRcuWLDkinZgnk=" }, - "version": "unstable-2023-08-17" + "version": "unstable-2024-06-28" }, "puae": { "fetcher": "fetchFromGitHub", @@ -724,10 +724,10 @@ "src": { "owner": "libretro", "repo": "sameboy", - "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + "rev": "51433012a871a44555492273fd22f29867d12655", + "hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=" }, - "version": "unstable-2022-08-19" + "version": "unstable-2024-06-28" }, "scummvm": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "a9e64edf73f36fb1a4ac616b11131f6380d8e968", - "hash": "sha256-3m2YTy1Y/ENhI4qmH3FQBZMEKNHsDJVZeOOLRrLj8lw=" + "rev": "d514d135a7d3521e16e9ea599690e36e95c5c1aa", + "hash": "sha256-qk73jA8J6QD9Fp1tjqEf3eDLhJxp206gsku42ICjqPY=" }, - "version": "unstable-2024-06-13" + "version": "unstable-2024-06-18" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -774,10 +774,10 @@ "src": { "owner": "libretro", "repo": "snes9x2005", - "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + "rev": "285220ed696ec661ce5c42856e033a1586fda967", + "hash": "sha256-jKRu93zw6U9OYn35zXYJH/xCiobsZdzWROge7+sKh6M=" }, - "version": "unstable-2022-07-25" + "version": "unstable-2024-06-28" }, "snes9x2010": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "b477cb56bc6fd8b6977dcee279f16de01348bdae", - "hash": "sha256-jGyEah9eBEvNB4HewL60yXZvpHseeScYrHsRtzUtjN8=" + "rev": "69b300b6f9d46c4f9caa2df1f848a74163cd1173", + "hash": "sha256-8TgbZzmuwDUn23zR1/XKIOdrLwgzq18oMS1KOhSs1oQ=" }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-30" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -814,10 +814,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "7a27436548128c00e70b08dde63c52118e2a6228", - "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM=" + "rev": "8a999111ff3b8e40dd093c214dd56ba1596e1115", + "hash": "sha256-H9NWRbtqc+Zx/cBtS6LAbL6DsTLeDGGXhRRBD5W5tHg=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-06-29" }, "tgbdual": { "fetcher": "fetchFromGitHub", @@ -855,30 +855,30 @@ "src": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", - "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" + "rev": "b5a4788747fa46afe681080db758f4a827ff7274", + "hash": "sha256-R/WaUiVlRbytra/jJyZZvkDbmnZvsO4RLFYYTp5Rcvo=" }, - "version": "unstable-2023-08-18" + "version": "unstable-2024-06-28" }, "vba-next": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "vba-next", - "rev": "ee92625d2f1666496be4f5662508a2430e846b00", - "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" + "rev": "2c726f25da75a5600ef5791ce904befe06c4dddd", + "hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=" }, - "version": "unstable-2023-06-03" + "version": "unstable-2024-06-28" }, "vecx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "3a5655ff67e161ef33f66b0f6c26aaf2e59ceda8", - "hash": "sha256-NGZo1bUGgw4YMyyBfTsvXPQG/P130mkXzt4GXE/yatU=" + "rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf", + "hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=" }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-06-28" }, "virtualjaguar": { "fetcher": "fetchFromGitHub", diff --git a/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix index 5fba8b5376..57748a04da 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/amhndu/SimpleNES"; description = "NES emulator written in C++"; license = licenses.gpl3; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "SimpleNES"; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 9abb44fd61..8082194500 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/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.11"; + version = "9.12"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; + hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.1.0"; + version = "9.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; + hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; + hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix index fab06bd8da..6e5e69a106 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-xs9K8WrckkpyzHnjYlzRsicMW+o7nTMYCIZVWOwx4PU="; + hash = "sha256-wGiRMNgp5NZVj8ILyQ2C/iqpjv4XgphRfWcF/CSMj48="; }; - vendorHash = "sha256-p92H4JqklrV0c4vp9puAgDzBzMpwI40WPz9ix0e77l8="; + vendorHash = "sha256-MTM7zR5OYHbzAm07FTLvXVnESARg50/BZrB2bl+LtXM="; meta = with lib; { description = "Terminal file manager"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix index 3853119126..7b5c4340ed 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-NTpowZCl4OTWrK2txh7f7t9WxGRdfM0M3KIyHq3nJUg="; + sha256 = "sha256-6hNNda4BKCY9E02uFYJnt0JySNp/is1ZqjFlOwQcRWs="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch index 725c0b350e..a1771d9f03 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -11,16 +11,6 @@ index b51fd0075e..87ee317e05 100644 IF(_pyqt5_metadata) FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) -@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) - ENDIF(_pyqt5_metadata) - - IF(PYQT5_VERSION_STR) -- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") -- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") -+ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") -+ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") - FIND_PROGRAM(__pyuic5 "pyuic5") - GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake index 69e41c1fe9..5456c3d59b 100644 diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index aa313fef85..3515294150 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.7"; + version = "3.34.8"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo="; + hash = "sha256-UeyGx+C7szXv++hXFV006Xk4oSKfSj4teJIwaD4ODVk="; }; passthru = { @@ -147,9 +147,7 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -164,7 +162,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index c20e9209f0..3efce9160d 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -78,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.36.3"; + version = "3.38.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uPyW/zzoyyd3SXvP+h9joJEv9DjRNJSaorx1rNmAaFQ="; + hash = "sha256-vL9Go8Kn6VFOeztD/LZi5QHpZVPFfOFarTsCLTf4D2s="; }; passthru = { @@ -148,15 +148,14 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" + "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -165,7 +164,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix index 05fb56bb5d..111e37711e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI="; + hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock deleted file mode 100644 index 6bedc746b2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock +++ /dev/null @@ -1,1915 +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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[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.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.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 = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cairo-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" -dependencies = [ - "bitflags 2.4.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-expr" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -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 = "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 = "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.37", -] - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[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 = "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 = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "emblem" -version = "1.3.0" -dependencies = [ - "anyhow", - "futures-channel", - "gettext-rs", - "gtk4", - "libadwaita", - "librsvg", - "log", - "once_cell", - "pretty_env_logger", - "regex", - "xml-rs", -] - -[[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_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -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 = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[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 = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -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.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[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 2.0.37", -] - -[[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-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" -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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -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.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" -dependencies = [ - "bitflags 2.4.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" -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.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" -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.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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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 = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[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 = "libadwaita" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "librsvg" -version = "2.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b6285fca2e4de40d61e398408a4cd261d475a960da58ae28d94d6352088078" -dependencies = [ - "cairo-rs", - "cast", - "cssparser", - "data-url", - "encoding_rs", - "float-cmp", - "gdk-pixbuf", - "gio", - "glib", - "itertools", - "language-tags", - "libc", - "locale_config", - "markup5ever", - "nalgebra", - "num-traits", - "once_cell", - "pango", - "pangocairo", - "rayon", - "rctree", - "regex", - "rgb", - "selectors", - "string_cache", - "system-deps", - "tinyvec", - "url", - "xml5ever", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[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.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 = "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 = "matrixmultiply" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nalgebra" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" -dependencies = [ - "approx", - "matrixmultiply", - "nalgebra-macros", - "num-complex", - "num-rational", - "num-traits", - "simba", - "typenum", -] - -[[package]] -name = "nalgebra-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -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-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.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", - "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.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "pango" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "pangocairo" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" -dependencies = [ - "cairo-rs", - "glib", - "libc", - "pango", - "pangocairo-sys", -] - -[[package]] -name = "pangocairo-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" -dependencies = [ - "cairo-sys-rs", - "glib-sys", - "libc", - "pango-sys", - "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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "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.37", -] - -[[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.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[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 = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[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 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.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -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" -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 = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[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 = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -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 = "rgb" -version = "0.8.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" -dependencies = [ - "bytemuck", -] - -[[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.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "safe_arch" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.4.0", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[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 2.0.37", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "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 = "simba" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" -dependencies = [ - "approx", - "num-complex", - "num-traits", - "paste", - "wide", -] - -[[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.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[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.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[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.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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "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 = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wide" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" -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-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", -] - -[[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 = "xml-rs" -version = "0.8.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" - -[[package]] -name = "xml5ever" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix index 6d490fc241..2b249d7e29 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , rustPlatform -, appstream-glib , cargo , desktop-file-utils , glib @@ -11,7 +10,6 @@ , pkg-config , rustc , wrapGAppsHook4 -, gtk4 , libadwaita , libxml2 , darwin @@ -19,7 +17,7 @@ stdenv.mkDerivation rec { pname = "emblem"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,15 +25,16 @@ stdenv.mkDerivation rec { owner = "design"; repo = "emblem"; rev = version; - sha256 = "sha256-VA4KZ8x/MMAA/g/x59h1CyHhlj0vbZqwAFdsfTPA2Ds="; + sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-2mxDXDGQA2YB+gnGwy6VSZP/RRBKg0RiR1GlXIkio9E="; }; nativeBuildInputs = [ - appstream-glib desktop-file-utils glib meson @@ -48,19 +47,22 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk4 libadwaita libxml2 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = with lib; { + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + + meta = { description = "Generate project icons and avatars from a symbolic icon"; mainProgram = "emblem"; homepage = "https://gitlab.gnome.org/World/design/emblem"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda foo-dogsquared ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda foo-dogsquared aleksana ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index f4adcace1e..bc27d93db6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs="; + hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og="; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 6d938fe4bd..9b6e71057a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.48.1"; + version = "1.49.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-U4MmVK75tPYJStJ0RRjfbzSbpGLJ07rJg6ClHI+tAfM="; + hash = "sha256-AMlhhsbwLhofV/Sy/EXuE4l0UAwZf2Gxn9+x3MHno4Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index 20ff949a35..a0ad2ab676 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.2"; + version = "5.2.3"; kde-channel = "stable"; - hash = "sha256-wdLko219iqKW0CHlK+STzGedP+Xoqk/BPENNM+gVTOI="; + hash = "sha256-RmpG7bk8PjetZSB8+WAjSJCnJ0Tg9E8shV3kx9iCXMA="; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix index ff859b4ed7..b781bedd08 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -28,12 +28,6 @@ mkDerivation rec { url = "https://invent.kde.org/graphics/krita/-/commit/2d71c47661d43a4e3c1ab0c27803de980bdf2bb2.diff"; hash = "sha256-U3E44nj4vra++PJV20h4YHjES78kgrJtr4ktNeQfOdA="; }) - # Fixes build with libjxl 0.9.0 - (fetchpatch { - name = "fix-build-with-libjxl-0.9.0.patch"; - url = "https://invent.kde.org/graphics/krita/-/commit/ace7edcca6ad322581ab39620f21ccf3ffbd3b5a.diff"; - hash = "sha256-dXk4+HNS0+Ie/8V4+Oj4rBJrJbNHG57gIzPymXLEc9M="; - }) ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix index 95889ffff4..4cbd7a8f00 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix @@ -79,11 +79,11 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" - "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" - "-DXRT_HAVE_TRACY=ON" - "-DXRT_FEATURE_TRACING=ON" - "-DXRT_HAVE_STEAM=ON" + (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) + (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) + (lib.cmakeBool "XRT_HAVE_TRACY" true) + (lib.cmakeBool "XRT_FEATURE_TRACING" true) + (lib.cmakeBool "XRT_HAVE_STEAM" true) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index d72994e008..9b29f6ddc9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -32,6 +32,8 @@ , wrapGAppsHook3 , qtwayland , cairo +, openscad +, runCommand }: mkDerivation rec { @@ -69,7 +71,11 @@ mkDerivation rec { ++ lib.optional spacenavSupport libspnav ; - qmakeFlags = [ "VERSION=${version}" ] ++ + qmakeFlags = [ + "VERSION=${version}" + "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp" + "LIB3MF_LIBPATH=${lib3mf}/lib" + ] ++ lib.optionals spacenavSupport [ "ENABLE_SPNAV=1" "SPNAV_INCLUDEPATH=${libspnav}/include" @@ -112,4 +118,14 @@ mkDerivation rec { maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; mainProgram = "openscad"; }; + + passthru.tests = { + lib3mf_support = runCommand "${pname}-lib3mf-support-test" { + nativeBuildInputs = [ openscad ]; + } '' + echo "cube([1, 1, 1]);" | openscad -o cube.3mf - + echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf - + mv cube-import.3mf $out + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 86e85e0efa..87df464090 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-aiQlcTID8mfrT4MEx4s5K+QmMHBlHOu2HfsValiH5qU="; + hash = "sha256-/0+zIPvQFwQYX1jtu0U8rKLFAbHP0lk5RYHxVUZhebA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 844878a349..8185f59c74 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.6"; + version = "0.32.7"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY="; + sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix index d3708dd0c4..a9da96b058 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "5.0.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-ATV/LxXQNJB6rjBmurx6a1gRPR8zNuILstvEJoQJhUs="; + sha256 = "sha256-fqkGfK8Z6CxJIFhqS56fGF3PNACQRGEtTPcBDZpvUpE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index 3599cf7003..ee4030053b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.23.2"; + version = "3.24"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; + sha256 = "sha256-4aotsOippuKUucweWERtqm/5pz2gwW1Sue48KPisQ0I="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix b/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix index 5b1e1aac20..d4430ac9e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libqalculate -, muparser -, libarchive -, python3Packages -, qtbase -, qtscxml -, qtsvg -, qtdeclarative -, qtwayland -, qt5compat -, qttools -, wrapQtAppsHook -, nix-update-script -, pkg-config +{ + 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.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-L6qHaksArgwySk6J7N5zamUDWh5qa6zTtPFdpxU2NTM="; + sha256 = "sha256-vlap8gTZYoQS70Co99bZ16Fv9eq1N3rH7skjwrLDWiM="; fetchSubmodules = true; }; @@ -36,24 +37,31 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - libqalculate - libarchive - muparser - qtbase - qtscxml - qtsvg - qtdeclarative - qtwayland - qt5compat - qttools - ] ++ (with python3Packages; [ python pybind11 ]); + 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' \; - sed -i src/qtpluginprovider.cpp \ - -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," + # WARN: This is necessary for albert to detect the package libraries. + # Please check if the file below has changed upstream before updating. + sed -i src/app/qtpluginprovider.cpp \ + -e "/QStringList install_paths;/a install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" ''; postFixup = '' @@ -77,7 +85,11 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; # See: https://github.com/NixOS/nixpkgs/issues/279226 license = licenses.unfree; - maintainers = with maintainers; [ ericsagnes synthetica ]; + maintainers = with maintainers; [ + ericsagnes + synthetica + eljamm + ]; mainProgram = "albert"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index e54cae9e56..3d044abaad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -7,6 +7,7 @@ SDL, addOpenGLRunpath, alembic, + blender, boost, brotli, callPackage, @@ -372,6 +373,20 @@ stdenv.mkDerivation (finalAttrs: { --render-frame 1 done ''; + tester-cudaAvailable = cudaPackages.writeGpuTestPython { } '' + import subprocess + subprocess.run([${ + lib.concatMapStringsSep ", " (x: ''"${x}"'') [ + (lib.getExe (blender.override { cudaSupport = true; })) + "--background" + "-noaudio" + "--python-exit-code" + "1" + "--python" + "${./test-cuda.py}" + ] + }], check=True) # noqa: E501 + ''; }; }; @@ -381,7 +396,8 @@ stdenv.mkDerivation (finalAttrs: { # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport unfree; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); + platforms = [ "aarch64-linux" "x86_64-darwin" diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/test-cuda.py b/third_party/nixpkgs/pkgs/applications/misc/blender/test-cuda.py new file mode 100644 index 0000000000..8a3ec57347 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/test-cuda.py @@ -0,0 +1,8 @@ +import bpy + +preferences = bpy.context.preferences.addons["cycles"].preferences +devices = preferences.get_devices_for_type("CUDA") +ids = [d.id for d in devices] + +assert any("CUDA" in i for i in ids), f"CUDA not present in {ids}" +print("CUDA is available") diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index f3429399b1..d3c1ac3506 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = "refs/tags/v${version}"; - hash = "sha256-gDDFrF1yK6mWwkb3KJVRj6P5aiH1pQ/xL17XwVb4rfk="; + hash = "sha256-Xtm+SFJOSb04WlooRhTopYtyiXEOkOmiPojM8E7l5vY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix index 49e3f13b6d..0aca420fc7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "cobang"; - version = "0.12.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4="; + hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix index 8fd8ad8f33..2f73d2d8de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix @@ -20,13 +20,13 @@ crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; rev = "v${version}"; - hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc="; + hash = "sha256-55qCHc+snMAUFAT31Z8EPtJ/HLrnv1BveCEzjkn7N5g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/shards.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/shards.nix index e1b6032d59..0fe9fac03e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/collision/shards.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/shards.nix @@ -11,8 +11,8 @@ }; gi-crystal = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.22.2"; - sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; + rev = "v0.22.3"; + sha256 = "1xyj5bf3l2i1yzqxb8yyj0fc3kwi9nnd57n5dhs5xm9jxzcvw1kk"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 56bd8bce5b..a9d7d2730a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-N3WeU+8KJwYKvuN4I1ZNEtIgLTmh/XgnhwATwV7dsvY="; + hash = "sha256-j9gwE/iLbBM8sdNZgc7hYnKhJEMkLn/g9HVlsKn4moo="; }; - vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec="; + vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix index ae614d35a4..d9d7681b36 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix @@ -11,21 +11,20 @@ , gtksourceview5 , blueprint-compiler , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , template-glib }: stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; + hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook4 - appstream-glib desktop-file-utils blueprint-compiler ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 3694f8e232..c3d5340640 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.0"; + version = "1.30.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q="; + sha256 = "sha256-R8lCAZkClmCFkiNPf9KGlzj2td3KxCx/7UkdTJgDtwY="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 1172571488..022416c376 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; + hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix index dc1021c6d8..cc576b7a0a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/wakatara/harsh"; changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ laurailway ]; + maintainers = with maintainers; [ ]; mainProgram = "harsh"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix index 39073ee81b..e8d90c9e16 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Convert hcl2 to json"; homepage = "https://github.com/tmccombs/hcl2json"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "hcl2json"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix index b4ea7d829a..9a50ac4874 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; maintainers = with maintainers; [ ericsagnes ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index b9eea1c602..d03b005d0b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2024.03.1"; + 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-9Bu+mWfJuPaH5nV71JMrcGipiZWfcf19KfVauCW92+I="; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; } else fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-EZ3iqp0A2BZwI343nvvp71RGQx6FPesUBy4Lha4Yz4U="; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; }; src_repo = fetchFromGitHub { @@ -57,12 +57,13 @@ stdenv.mkDerivation rec { find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; find $out -xtype l -print -delete wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ] } ''; meta = with lib; { homepage = "https://github.com/koreader/koreader"; + changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e..3d241f30ef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix index 42bbae72af..91c59315ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,22 +2,19 @@ let pname = "mobilecoin-wallet"; - version = "1.8.0"; - name = "${pname}-${version}"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; - hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; + hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 000d94bbee..9ca05a653a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.5"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.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-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 9857865478..83dc79a059 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -116,13 +116,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-kJTYIsbNr6cLzti8yg+IlXjbKwXuwumE3Wydy+oTeK4="; + hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; }; propagatedBuildInputs = with self; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix index e0832ff245..ce92193727 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "openrgb"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix index 0ab84ea083..8ca73be275 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; + hash = "sha256-Xw6Z/xDPQEVMdxMzrhtPAl3nOD7oMlZhKDb9bD8GEO8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index 7e0dc4c2fd..5dda053eb7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; rev = "refs/tags/${version}"; - hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; + hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 4dd5a5e2d2..f752052da2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = gitUpdater { - ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x + allowedVersions = "^1\\."; url = src.gitRepoUrl; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 14b2f19ccd..d4b014ea85 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.30.0.0"; + version = "3.30.1.1"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; + hash = "sha256-hZe1rTRkvdKC/row0Li6hsmOcLKkMULo9ScOvvjmWCA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix index 0f6be51187..b86a69ea27 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -2,13 +2,14 @@ lib, fetchurl, appimageTools, + writeScript, }: let pname = "remnote"; - version = "1.16.18"; + version = "1.16.48"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-ps7Rl1oA2QOPvO2XeCY8DrWtCV9WPlX9jbhypz2ZARA="; + hash = "sha256-tECIn43fTr+Enkp63S7INUjOrs8Ni7Nmhxsr/p6kPzo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in @@ -22,6 +23,19 @@ appimageTools.wrapType2 { install -Dm444 ${appimageContents}/remnote.png -t $out/share/pixmaps ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl coreutils gnused common-updater-scripts + set -eu -o pipefail + url="$(curl -ILs -w %{url_effective} -o /dev/null https://backend.remnote.com/desktop/linux)" + version="$(echo $url | sed -n 's/.*RemNote-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')" + currentVersion=$(nix-instantiate --eval -E "with import ./. {}; remnote.version or (lib.getVersion remnote)" | tr -d '"') + if [[ "$version" != "$currentVersion" ]]; then + hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")") + update-source-version remnote "$version" "$hash" --print-changes + fi + ''; + meta = with lib; { description = "Note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix index 256ed98f9a..53ad4f9aea 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix @@ -18,14 +18,14 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-cloaGlHjtwrjuPGzAG55B58w307R+TO+MixAWTw2ags="; + hash = "sha256-+s7KXl3+j/BaneOBqVAMJJhmrG6xtcGaHhYnMvUfiVA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix index 2ec7f35a21..d4509411dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix index b3653d5064..bead03c4c7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "schemes"; - version = "0.2.0"; + version = "46.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "schemes"; rev = version; - hash = "sha256-XUC24KzZSU4+F2JZMsydukvAwEGdMxCnkPG6QHnCw6w="; + hash = "sha256-m82jR958f1g/4gSJ4NbNa4fwxVseH399Z8JpWr7tLh8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix index ef361fc6f1..6b0d3e9572 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/synergy/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog"; mainProgram = lib.optionalString (!withGUI) "synergyc"; license = licenses.gpl2Only; - maintainers = with maintainers; [ talyz ivar ]; + maintainers = with maintainers; [ talyz ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 51be31c4db..87faa8ae0b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-pdfZMKsNKmQVUfYobaOdUqGgP99fatEpgn0AHt0bIBQ="; + hash = "sha256-lb0kjPvpjqHQ+DUdrQmaSIaxEdwsOq29RTe3zL25NQc="; }; vendorHash = "sha256-CN+2+aOOPF7gouvp7lCfRIKA1quNCcrvzHg8lF6J4f8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bbcfc83507..7a6ad1abca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-BWZaa1+3EUG11RmZjjbwG2UPZhlCpW3X9rkpiWrjgzM="; + hash_darwin = "sha256-154JPXP5qCM94zQRkRSvPKk6RGIhani7FUwOXgIwUZ0="; hash_darwin_aarch64 = - "sha256-wkUIFolVdvcnEQKKehKCyD5GS5Q42fVFKj/iHtiIj8I="; - hash_linux = "sha256-owTmkkgMcmuuhGv23uNjFjBdC49IJt+v6rjWu7xuchQ="; - version = "126.0.6478.62"; + "sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac="; + hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ="; + version = "126.0.6478.126"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-05-13"; }; }; - hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; - version = "126.0.6478.114"; + hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; + version = "126.0.6478.126"; }; ungoogled-chromium = { deps = { @@ -27,11 +27,11 @@ version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-lj/XYWkEo7M1i3D5e1MVXTXh02U55lNoo+sxKpu8FNc="; - rev = "126.0.6478.114-1"; + hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM="; + rev = "126.0.6478.126-1"; }; }; - hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; - version = "126.0.6478.114"; + hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; + version = "126.0.6478.126"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 30cb040f3e..7aa9e82430 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "127.0.1"; + version = "127.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ach/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ach/firefox-127.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a0c0adf6375c16fb0788c5d2547a58cdf4eb39fa2202490709e828143e253858"; + sha256 = "4dfae5ad421dd82245663acde11aa82f10fbd073f45729c9c026bb67864f5158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/af/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/af/firefox-127.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "537284719c1ce1f5e5664bc0d7215d70e1ff8ceebebfd8f4de5aca7af6d078e8"; + sha256 = "b3b74ee172d8692d0f6e2a09df097f360c726e66687479b5629e5f3825ec59a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/an/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/an/firefox-127.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ed24dab4577adad1932474182bfc1a4bbc421879b295234c9bfcf12201254e45"; + sha256 = "36f54f2a806593130608a24ad46269045410a64f6b0f03a626c5493d9ef45c5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ar/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ar/firefox-127.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7a5d3b7a6519b1a82935486f21ee8bf6802a6bbd5fcc2035674b9881b5b0cba0"; + sha256 = "19a33b4b6d2c9628d9f46a3ea54ad265524be6734c5b4941c3b10ee54905bd2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ast/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ast/firefox-127.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b3219057f2b99d0d84225af34dbd35988cf3d462df2e69e3f57aba9bbc87e093"; + sha256 = "4f38bae88ccdf64c6b01006b89a28f59ac4b4cd56a1bf4a9652de96618cbdf7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/az/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/az/firefox-127.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d16a676d90b8290f2a97fc09cf7edc6ba5c57a33b4b626163a1a2ffc559c444e"; + sha256 = "dd27539fca8bb7f96bcf3e427d0ce24d4e4c0e85f480ee3d88582edfb9f87e9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/be/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/be/firefox-127.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9697faa8a0fef7fcf2149d4e27a943b5576ddd1f166d1e9e3436019306b51c0d"; + sha256 = "edade0529527a7244d35952cd0a321e55da0df7bd5f0ed9abfe420381a15c60a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bg/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bg/firefox-127.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c156390b7821f8e9b818273ef4645b18b0370fb4eff2685c386b28e26035b1ba"; + sha256 = "2878112dad9743ed79df6412c1504ce2df74815bf6a94f3e3d7e8e82fe5661b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bn/firefox-127.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a237d94d62d8310ad6a7f4b44e8560aa70869bacec5eb1ff03ad10b1fa204099"; + sha256 = "a6ea19219ee6aaf02aa5957a91a9687f5775fbf8b560457bc36bb27e58251e90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/br/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/br/firefox-127.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0e8e14857e6fe8f07dab736ca94704f042488aa66f09a34472d2e4db68a1d7fc"; + sha256 = "c98bd781a092e33e223322b5f1b758c96cf6ef2560ce6738a14004701266715c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bs/firefox-127.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a4533e64c5b28e3b721f6b5d27b226fbf25c781335af9541249a2d4805fdda3c"; + sha256 = "0082d6d4004ab6aaf0a212b2aaab5e71a199296b718f2cd854b019d775505cd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ca-valencia/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca-valencia/firefox-127.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c06fe9609e60476da4dd993eb56a282c85ba6f6b6ed0334e02ff6fa76792e243"; + sha256 = "f3344a8ec525b945d2d28f7cca7c85b0259a3c74913ae3fca92b4ac3956e6386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ca/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca/firefox-127.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3d7d25afeb97e4349798642fa2726e54d52a075dab40dc4c8bdf8c1a56a90e9f"; + sha256 = "d001c54e02d9ad4f050b0b278a06c21f407f3b2857b5d9857d98effcbc565254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cak/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cak/firefox-127.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "091c97903fe7ca206ba6e65432c303ed411e9dee5a58ce4acde78e092c255982"; + sha256 = "cd9192d363f75d01e91198e8b3099118551865a09acfce3bf3b3faa3d10271c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cs/firefox-127.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "62b1713abeb49e6d2857cdd90ed881df1e406845a021166a2404110b85aca93c"; + sha256 = "d9c1318224e2cff169a91c149d31365e1b4d1281373aa7fa2b580e7c96d416cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cy/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cy/firefox-127.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7471bdb9c4f8e0ae467674f4a0d962edd6c09514edc02b132c2d99b5684c6f66"; + sha256 = "88f4f8f626f9506af309b7330e51354de96e0cdae323f140a5ed2585ce0bb64f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/da/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/da/firefox-127.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6bfa2559875407261eb3c92a369b40ca4c037a11e8e469625a994fb7121ee6e2"; + sha256 = "8dce8aaa01be56cf2862c3aff05fb36bbff26ef6ac6d879499385df57c0fb1ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/de/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/de/firefox-127.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8f2b346f972edcba3f0b8e8cd5797ab688a9753b8c518696d5cb48a449d4430f"; + sha256 = "ec9a45975a649a2bf851b2e28cb36098a5df28fc4ef6bd78ec576e25b6b56148"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/dsb/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/dsb/firefox-127.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "954ba4d197384bd088890c5405f153b704b2377e9e831214da195c2d317c8cb4"; + sha256 = "8a633651937fcd2370d1b92414d92f40e7bc3b24d8b5fe706a1bfcf0dd7ab784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/el/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/el/firefox-127.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fb2e5c257cf29c26b2a9b070324d6545ed2b97d4a7ca2454426081773cbc6fd8"; + sha256 = "ae236ab979107d8872473ace4e0613f348aa6e253d7f9ecc3324151ae8b0d68c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-CA/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-CA/firefox-127.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "223758c5b6b45dd153655543909d18f0a4e9050d27b101a6609f6bf267c6ce2e"; + sha256 = "1a0b556ee830faf468424a9ae4f6674ca9d3c7e543a8a96645add085f6cd973a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-GB/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-GB/firefox-127.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7018c6907f2de68555b167f880a68b37016f55f4b5ac5546faa376c43d4d0dca"; + sha256 = "dc0b55ddf32c5ac9dddf252099f76befbd8ca5155e734299187857a5fb18fadc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-US/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-US/firefox-127.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "57564e6219f8f79418ba49d1e7a6edf44f8e253f777d0ae7de7dbff200c3d5f4"; + sha256 = "9e200146236e2403d4be088b49a6c8de3294ff1aa000ebf385d42c593207954b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/eo/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eo/firefox-127.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "24a0e8904f7b6cd7609706fde278ccb57cf076d13569f9ac1197b5cbb6f8c6b9"; + sha256 = "c50d34862367350aa694ac8b5ad97873db38f3fb8a2350c7b509cee85d90f417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-AR/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-AR/firefox-127.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a29924f5eb27ce2e6907d23e32d95fb1f39c44e377703e558eabd10a0becc6ce"; + sha256 = "10f171448d215525df0bfce6032ae1526e1386307c563c672c333421b9a602e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-CL/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-CL/firefox-127.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a273ae90dcdac41bb83ed9024e0c1a7be9e6389c3e43af983b8d1f26f29d72cf"; + sha256 = "b5d9e56e9b814df519e169bb238d8777a56aa6564b21688f9a6cdeedf1196471"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-ES/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-ES/firefox-127.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "904aa7e93abb39ab0357ffd88c1d9c3c1f6fdae45a6fd43fa267999201ecc7b2"; + sha256 = "2ce2327cd3fee48bc33b04f142fcf208aa4bf1fe5a3153e5516b28d6a8d09822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-MX/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-MX/firefox-127.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5b01c5f7d2d5ce93d9095df7c02a10c6f81e458454287b96cca9b65bd5734d3b"; + sha256 = "8c28e006fd14a56c64c56c1582495dfaa50059d339a2ffecc8f026e85cd473ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/et/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/et/firefox-127.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c84be37b30e5f26d1fb0f7a6bedc0765b5c58080668eb763305fae2678c32a7a"; + sha256 = "1cde2e22e944213cf66f81b339a07bf6b51934597c95839e7b1fe9177c0eaf05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/eu/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eu/firefox-127.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "bf46def3eee9f000b4227e8778c6c2ef09b4bb78dd7c8f1ac5d0d94d345a2135"; + sha256 = "a2963d61444576b3ec18af5c0562d1348049e86e0419d046bb9d08ea17e5d463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fa/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fa/firefox-127.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d87f5f3e532231c80db40904248413b3891e6268042701824fb19abfbd3b5207"; + sha256 = "9d3a3d49c64f9c71b504d8ddfb7134dbca5e4be516c4918a93e6fc27b23d0c3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ff/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ff/firefox-127.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c3c3162929d576c9311ce42d1211c091f8ade66cfc119b961e04d9a278ba4194"; + sha256 = "63b1e31fc5eb80156ce506069e34c8cb746ef0fd9e862372b70af51f84b96a88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fi/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fi/firefox-127.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f0ef6a70f6ec7f1da1a4b4d695c62fe7dc1d9ca44e7a4f8cdc17d15ccca4ec61"; + sha256 = "0dc5a2af7f7b5232172f35ab830c50e922f03faeb1d145811d3dcfd929ff207f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fr/firefox-127.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2c9c074c8c9a5b4b7124c683b13f4a2be55bee9f4c9d4eba5fdc9037bfd4ccd3"; + sha256 = "774d6d7377e8681fbf41098d4b97c8b2a6fa5733a16e82fa30281ca910c9158b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fur/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fur/firefox-127.0.2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "7433574cf039d131cb60545c0f32748382c221eff400887360367a16b06a11f8"; + sha256 = "cc6f207e654aabbf98b62eb35037b382faef0f20a0579900c294dcd04d8e672c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fy-NL/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fy-NL/firefox-127.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "083497725c22b842831f80c59ecad6381f27059465f3d34e28acb6b5ebeb4985"; + sha256 = "bee7bb15e83fcbd301814c6fa5af00e981ff411ce8f5e54d7f7ca1e0ac702b7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ga-IE/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ga-IE/firefox-127.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "36221c549b08bf499a367d82543490bd006340cec627382b2314902141a75f0c"; + sha256 = "84d2a4286f25871773c77ed74644e88a7a32c03fa65102d583727a9a63442c57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gd/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gd/firefox-127.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a17ac5509f06f7df302cca1f68f2ba2ca8ec5035cd552f6965c566a2000b4b29"; + sha256 = "f42aef7cf706b73b0e4f9228513b9d5c6f0e94416facabf16d516e41980fe4ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gl/firefox-127.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "83b3c09c08a178eb62007bc0328bce8983f84d0f250d3687cee03608c4c18f14"; + sha256 = "9ef6d0ab0f038d61a0eebf6306522705b86657b0e453c3883a3ff282ed0ecdd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gn/firefox-127.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "465e77519706a75225365d3c4a004aea9279576482e7cec2d62aa8b7a886e9bb"; + sha256 = "74a1933f6a3e32aa7bc5ddcf7cf6cb8a6d213f251bd996413db26e30136d0ef2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gu-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gu-IN/firefox-127.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "53e09098df9675eb7f55d9423690a59a3772b5903a21634846677613975ae5ae"; + sha256 = "5be06369f5db552e0e74b8533c0d594695d0e9b1beb2a13e882085981c2f734a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/he/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/he/firefox-127.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "681dd31829c32ae960afac4cfa39da6c4ed7c68f11359e52b3814d347e30be8b"; + sha256 = "6f02e9268fdcc0c328279df1113cd886fb640ac14f883d46500542284beea134"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hi-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hi-IN/firefox-127.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e8f25e4ddf824410ef01b25302eb1e6c2fd476bbbfd9ec4de19b6b634d108a5c"; + sha256 = "a1530fd469d553ed332f685d5688efac2a5766039f42a889475333b13f05d016"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hr/firefox-127.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "386b31c0825eeef34d3743fa627a6b68e54830b376bb28b03487b4c4840e7120"; + sha256 = "60ab0be6f32c8c27336eaa1d40e92f750381a527178ae3ca98540b5f1fc39b2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hsb/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hsb/firefox-127.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "76807eb27de86c4f3f9a2ac8eb3d2968fa9efcc47d4a948f3327e6a803d78e07"; + sha256 = "5dd37ab66bd3aeb0aa82eb0f92ec82b24f15e3ef418b5b03d5c57846b9657f71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hu/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hu/firefox-127.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7379aac9224724195248879a86d12fa5d98fbc4d85b158982cfa8a79526caa6f"; + sha256 = "97ff3ab5dd865c4f550bfb710212083df39d82c47a053d603bf75022a9f1ff2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hy-AM/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hy-AM/firefox-127.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "eb23486d60353cd66efd09a7a05d15ce613279ebb8ce499a958927f0610fa5d5"; + sha256 = "c13f704a3231f35ef4944c5140a6ed89b2b88638a61c92a76d6460bf167a38ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ia/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ia/firefox-127.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a27ded0696059e04cf70c8b601a3bb74c220249c5d83ab28e03bf7a35c3afcab"; + sha256 = "a70dfaf92b39fc33dffc8f5c95b62c2783ff5c68d10e04c1f37dceb372b9aaf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/id/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/id/firefox-127.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "49ef7dd6b3308802fa3e71514ca026ca7a2864aabfc7ac9ec1e8495f65ecd0b7"; + sha256 = "507c9b6d80def4fa180c666f9da7c7910b954d794a2b8ee56cef160cd1bd1092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/is/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/is/firefox-127.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "84790d6b71ce317861c8c8405378c4c425aeb14287508d9a5a83daf18749505b"; + sha256 = "3c12b24d32d1629dad830575a391be0518e3f44940173760527827328d402059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/it/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/it/firefox-127.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ca16864d24423592ef1c5395abd636651a23b626f360463250667ca5e450d301"; + sha256 = "7b3fc208e75079e2f01de115f613db7e96d2e5f4122eeeee63db2f022eed60e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ja/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ja/firefox-127.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4c50ab7c8391e563f926cd1c40d4baa6321fa66eb69b9ae35ce96434130e0fc2"; + sha256 = "881e83cdf8effeb5e9f27f64c0ceebd522e56041d34ca3786a2801641dbbd3fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ka/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ka/firefox-127.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "184caed2b7fface9cf11e5932ce5ab46011ba7c73b01b49e02fa6b99765d8fd8"; + sha256 = "edafa57a48cd4b1935e851701c8b197adf601b50d6514edc9e6b41f390bf13f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kab/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kab/firefox-127.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8d8a5773d68b06d55800cc9df11425520d06b5bbb9835dc193768c183a21b111"; + sha256 = "0735d2b6243f167f61ec272b2cdf4ee0c3bb2b176ed184d54f48233946d2e4e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kk/firefox-127.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f68784a105ca7356526a93a2127be666231c067aed2b9c5e2f3e1c8905222cf7"; + sha256 = "e54e825997ae813d6fe2cea24ca19513d40e332dc5d8b95b86777caf95ca5d80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/km/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/km/firefox-127.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d218839e9391e990572b1097495b0e541f32f125f156cea594c62f4d835aca8b"; + sha256 = "43f2fa9985241a9b1472804af44c7719166dc122ecc42ea5ba34846a1564bc71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kn/firefox-127.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "fb306ea401e9f4a80346db9e2219019909afcc9a4366656537036d5b5b172846"; + sha256 = "ced0e62b4055403d0b78c36ab01d9a5242b627aa9132f5028d8ca756270dc65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ko/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ko/firefox-127.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6e072cce5c9bed5401b70e853620499150037e28a7daafa994f7da6375ec69d1"; + sha256 = "c645c840d9a7c1ae65ee52b3639b850ca461acd6cfed6935257a11868572e42e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lij/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lij/firefox-127.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ec0633670be69a1567799fc1210b3c2e55a7026b3b06af97689fdccf64ae1a2b"; + sha256 = "328ca467ce2bfa6fa8c3d21c4c2c44853cd2def892cdbde309fdc49121868d78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lt/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lt/firefox-127.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "25a2c72a65825704f2ec4848b2ac52f1d17533d97c1da2dd50fa20a05e1ef5b2"; + sha256 = "6e7d5279c77f91f4c0cb2e47b74dea071f0f80d7fc23453a1aeeb06e3b2d2990"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lv/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lv/firefox-127.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bd79848cae45a9df2538dd0c469d5b8c90af90804e157977d9d40ed208afe909"; + sha256 = "ff1baf65721034c4f0fbcc85b4de21f30abb696dc4bd42c379183abaf2d7ce8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/mk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mk/firefox-127.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "6b97978be93304c0292e1f337ce93b6da3fb0010864171af8afd4c42a931184f"; + sha256 = "256dcd6ee20c4b979b62060115d37123da404566a0bd2a2e676fb1e9533358e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/mr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mr/firefox-127.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a59d247dea428521aa142ad399cc9ca084ccae10e0bd115c62e3dc8f8929512d"; + sha256 = "084480eb31de920f8188a3eb0543322760924128c34b7667ed442bedf0c1b47d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ms/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ms/firefox-127.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "cc885d9b95439476ba92fedf0081bc72cd9651113ba6f569972f9a39d4b6c33f"; + sha256 = "4e8aaecd56f83c7d611ebb91f3693f4aae8a8d39ba6bb8b5e096eab1e18b923f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/my/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/my/firefox-127.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4c30bfc50c0e03b529e65b51742d1f0324cd43661f7ff4b4cac1ac84406ef658"; + sha256 = "5d5a9dea125a06fda41111ac750e6e80483ec69d2db035b38bf449a1e8a964ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nb-NO/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nb-NO/firefox-127.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "dfac26ea8b3f6ccc12d6dff7e6abdb28a160dfeefc369fc4f8c982222eb2f34c"; + sha256 = "6c6c20020c2e7163ba5f164ac5a65ac7a39c636921a5104702e59b228773bd41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ne-NP/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ne-NP/firefox-127.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a5efbf90c642886f41ef0ec9ddb128cdaf4e0823ba8df6a0d5f84e26530374b0"; + sha256 = "64a0476a467475606d93b01776c5f312203f2c890a1c46e57200db97fd2bade1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nl/firefox-127.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "13c1cd013686b626881ba82a3d38a3c6a5c6c69e64cda53aa4611ae78f8f498f"; + sha256 = "ac9a3d91a2c990040e9087eb2efc1162bd63f0d75b2932c0db7acf81d059f898"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nn-NO/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nn-NO/firefox-127.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "103ca53d1bb93a2d9c4b72fc7737ad8a7ecfcb99c5f0c81ca6bab5f607dffcd2"; + sha256 = "beca6cbf60ef413d5467a6cdd934fd338c510d9d350919acd6b86fe7fdd21df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/oc/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/oc/firefox-127.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "671ccb11cd07be6da9de610f898f07a4a739b594a74db9a400ddd22e39342f73"; + sha256 = "c3b69394a0bf611f95a046f474a0bbd1a31f59bb57f1ffc7752a82e61a856240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pa-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pa-IN/firefox-127.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "601883185a7c172aefaea9614f50e20649035fe619fe43adebdc471724e5358a"; + sha256 = "ce6a5d86485002aafdde6e8d5b77683b595dce9b20e07bc0525cd3f508e3b516"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pl/firefox-127.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a5a064b3663a084952f69d5566631ceb3e620b95ce4e068da8ea751644f091f8"; + sha256 = "773b984d1b091ddc839c2f1d123723be38a759e12536f874bbbdc1bb4e54dc2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pt-BR/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-BR/firefox-127.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a1d026e73053b77c0a38412c22b9e5621c57342b40568fc873d3bdc1f4a49f25"; + sha256 = "6d84e766c36fe3501a47f862fd7ed74c68ed12b334d42473db2b10ce8cd0bbbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pt-PT/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-PT/firefox-127.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "74b7a71616584ec2a11502a568e1929854d118c66460f6880f7caa662844f4e4"; + sha256 = "7e3e7af33b02149724008270b32c60b96da2b973716918c1dbbf677f93c5abae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/rm/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/rm/firefox-127.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3f064c79b273bcd244a3f4a874a6f88244a9519516da54cc83b84ca6a772c2d6"; + sha256 = "f8158f3bb19a27cfff9759a541187e764ca5462656f01c007ad4a2f665316f80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ro/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ro/firefox-127.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e85fa0c1b384aac2436a6f58d8b40e76ec5394ccccc00d86e39cb21ab49b9a99"; + sha256 = "b34bc93ea8417c84bc549ac889f06537ab7c14a384fe2de6b11965822daf178c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ru/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ru/firefox-127.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "06b66880d3b557f97485b953d39b6721cb3b19eeac025248690a756118427b10"; + sha256 = "3317259104bf35c1063411c61c24012c603dde4639e4cc1738746594ebd541d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sat/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sat/firefox-127.0.2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "973b140ff852f875989082ff4165435a985177b80ef053e1ab001725664a5380"; + sha256 = "8554b21b9f4e47ad8d55bed298fa23ff615358a2f4af9e3e747fd1633f26a535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sc/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sc/firefox-127.0.2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "36c7c937fe966e7b53854ced6564cadb7773cecd65e1f0ad9bec7710313e4c00"; + sha256 = "c5a430c37a1904d6c12360dd653d215397ac1c37ff3360ca905df0f10fc63eb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sco/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sco/firefox-127.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "373318a35308b01fbfc7bc6ffd541799ef31e9cf1ac88b7cff8ceff635037665"; + sha256 = "5eeef923d89ffe4ff1d3c059d9e793c599159e541dd553e5e7be367879faeeaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/si/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/si/firefox-127.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "215af3253c9863cfe20be347a423ee9881e18b4e35c33a2966bc8b2fc7b8cc39"; + sha256 = "a4f73e9a5cded4b81678d5da752443428659e64124365243d39397dd53a7a1d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sk/firefox-127.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "016385509ea105821bc2440f6d3255e1728e7ff85146e02b721f4948b0d85d65"; + sha256 = "c068e5fb31a5b55ca3c42cfac286275584239349d3210942b66d8cbfaffdc4dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sl/firefox-127.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "aab9e95b7a1e0a772df775aa0ecfb7965381c7a60df7d54e1c6fa06766c6a54c"; + sha256 = "7f22b8cde10c11aca641f7c14176c59d86b79a654e68bafadeadd4fb7e1ff3ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/son/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/son/firefox-127.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "435b70a26d25111a826615eea61409bb4f4a04d7758cbffd2b13c12fccd1091b"; + sha256 = "80523ddb2925d2252b839a0caacaab95770b86835385b7b58cb0b18b522065e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sq/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sq/firefox-127.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f7c10d47f4bba018ea8ed5d0d78069dcfa59d739e6872b3224cfeb2070232196"; + sha256 = "a8532d02deef7e88bd1a9e5a7a906718994418c231c12109400ddb675f347fa6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sr/firefox-127.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ed786d719bf32f81389c061853341d390b6e76ae73c32844bc55daf03e2a2c1a"; + sha256 = "462c47d4ebffbc6864be452b3fc00fed2c7cc14c26f28a6d0de3acf7ef817e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sv-SE/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sv-SE/firefox-127.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5b8ae2c28aeb8ed30217a243b4d56a22712b3768445597b081ac7f8a80f7ed49"; + sha256 = "6ed60502aa9c7b976b7c2bd8daa6c7f112afac6391db69b7538e2d8ccd1b084c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/szl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/szl/firefox-127.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "423043de87895e6efe4d65e8168ad541f13d9d33066ed91fdbc1658ab917534a"; + sha256 = "dc4caf3f2c931ca69d742afd807c9d1f62fa751bf94a15f2e3c9d06b45ab8878"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ta/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ta/firefox-127.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "da080e4ed39a54c9866c64abf899a51aa4f7843db9c32a0a5b83c2991ee97d9b"; + sha256 = "2d60ac71d827cc6dbcd09432c23af4ce2f6ba1095cb3ec19f0f9d9e4a3cbb6dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/te/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/te/firefox-127.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "05e5635671b7c2dff7fb1dd315b64d651e4c4f1c1bb319caaeb2f9ec3897c7fb"; + sha256 = "dff77f564ece7beb32830c7bf7862d80f6b606fdc31a9fd369912b813f139536"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tg/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tg/firefox-127.0.2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "edd6575e8c0275b2dbf69c3a63e3f34ae867dbbc7218980f3e5e65cfe446bd20"; + sha256 = "b9241d728186d4f369e94fecab46d653853eb1408166e56f7cb435ff52ccdaf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/th/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/th/firefox-127.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ff6eab71db2cd3a61ac5efcbcf1526623d0581fc8dd4ff084bea68b5a1b547f7"; + sha256 = "3e87332bcc8c998758eb9493393e91979c12204787efdc450cf480841e11ef31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tl/firefox-127.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1c550f3c9e8f7c67e98c013bc058018fd46a6eee04ca9e36c64ab51e2b9a83eb"; + sha256 = "9aa9ad4d4ff39cc06eb8180521124503238ec809e3c621ab037a0d0953448950"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tr/firefox-127.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "67058b4ef5a68a9359ab6e461b635018df5077606a634d980d6ac88ead2e9711"; + sha256 = "fea0de874ceb3b1febdf0af171bb8e2a77807b4be968ba843950980f61aa1bf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/trs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/trs/firefox-127.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4df827ad9203d47d671eebe05741407a95a7b8af9a25bfaffcd1b985c996f24e"; + sha256 = "b5e1ab4ee7050b903c99549329dbae45ccda6389c2db850925621e4d3ba9da21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/uk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uk/firefox-127.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ac38bc5b1dda7594e6dee4377ba93e6f0aee875d2a1c7dfedfa2e3c4ad11d1b2"; + sha256 = "61c1ac45be55258e45533aae32b9a95c55fac81820445d0e464768c48509fec1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ur/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ur/firefox-127.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f9d93101ccfbaba3861f9dc6bd3cd2686d888c974f721c109f90ec4219de6621"; + sha256 = "5dc29c0ba5a0368d09f73675633d7110b64b8ff9233ace5a0769e04b9c7eed7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/uz/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uz/firefox-127.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "815164350eda87d24df7c6607c23cea451dad55d4d2d2e9e732981d8bc2d186b"; + sha256 = "39698fa62f4361805c5a41f81853d44e082dedf78cfc5aefc58ddf5a00823ecd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/vi/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/vi/firefox-127.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0804a891b26fa2c0332a68f81a51ca80ebdcf4bf9c298dc2c66bd47107d4d289"; + sha256 = "5372cc16c0128005f282018185ad725ab65b5c04140a10a014efc2cb1fd59943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/xh/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xh/firefox-127.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ab5e298676d6ac9eeb129bf95606a1149a5fafa32a978a3bcf08bfdf70174f4e"; + sha256 = "5d4ed46c1fccdea8ad2be40aedd0ccb2d3608473cd450005a0dc6da356ae7c43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/zh-CN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-CN/firefox-127.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "089d9286a1109d902cab44581b97233a2e7bef664ea6dec267ffd539fb4e83d4"; + sha256 = "a7762c58e6839f764c10fedd2da38477be15817c00070b234af4f59495ab22f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/zh-TW/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-TW/firefox-127.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "350406bf0cf848eb0d06188ce6c2ce93ec8ad6b7b159c5b51a8bca94405ea354"; + sha256 = "55f6df7a2cba4b4a317de9285f9c6108267a3624790ebc6eabc0d497ca165d01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ach/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ach/firefox-127.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8e5e1be666d364bfd7aaa613826698db1b7df41cf6fa7ec5ef2c458800b67280"; + sha256 = "4262826552bf7012483cfb5a61c4cb3d99cc267ac84dd4eaa3fad4cb144910c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/af/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/af/firefox-127.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e9a00dd060c860403094edeb6e4f5918bb74ed2566fc354a5f27b9c1e4f9219f"; + sha256 = "da855058e17f89360708f658fccbfe1a099b5a82e1071227661c9a7bc1a96b4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/an/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/an/firefox-127.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d2f796ce73bd65263c88a7d6dc65adb2ed89393e85988528f48a7a3844153e19"; + sha256 = "20a8e588bc34e47582d815772129e6c77dca40d7bfece63493dee9a003c21671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ar/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ar/firefox-127.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "55614e36eb0ae0232355d3cb30d9e92a5cb9688f4f4b0d3a6d4c4f50e42696fa"; + sha256 = "3326c461896dae10a4c2ce300d58f36f38e2a6bb4bb2277579f73923eaa5e14e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ast/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ast/firefox-127.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "9275dbbe3f7c70de1a678952b80c88a981b09b552046e9dbd56374f5782378ff"; + sha256 = "af90ec9c53be0e0d885f781ea90db3995c7b0e323e91d793aeabfa995733ef91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/az/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/az/firefox-127.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "320f605b88549f87ba681c4f612da7c44e417f4b088e2d2302a8571ff7af3831"; + sha256 = "7a9c0ac72f90b44528f88be35bb5c18c7dc02819cb2cc9cc3b42628ce59a54bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/be/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/be/firefox-127.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "3e3e3b4dc051f847eda1a9c0a595ed99b34730133c47f4e31967bcc8fb769554"; + sha256 = "734fdceff2b722617e1aacd817ce823c076032481a731bf73b9184fca19fd035"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bg/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bg/firefox-127.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "79b51cce01b3d45f8ba16cb055e51d916a2fa152cd1c9ba82993a5305d5c1912"; + sha256 = "eb58480cf5a0291a40e8b95bc3083bbb7d251d9d82cf84ccc400bf3b60665993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bn/firefox-127.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "88e0c13b8a4a446e820d3d7bdb8fa0c78a7ab5cde0df91dff34f6a5cfcd8c7a5"; + sha256 = "678a0603ad497544b1bdc68181fc5ac9e2acae0eebd9946fb44315668ba78ec9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/br/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/br/firefox-127.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "aef8869b56071730b42df7cf77e8323e23b90ced72ea65426c2e0459ac419a01"; + sha256 = "6871ecd32da428ba9c9c8fd6c28401f1c77a79fc617304f330c42a57d866010c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bs/firefox-127.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6b03db27d91ccb544383837f34d53ff5bc20b70fe9175b2c1ff392e28b54c2ac"; + sha256 = "e3fcff0fd7f5354a080c222c8002497255040b19f5294d9e68a08379aa6ffadd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ca-valencia/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca-valencia/firefox-127.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1e7bd2a338efb565efcbaaab096bcc5a8234d453ddb6df892021da74dcf08043"; + sha256 = "e50fa7f62356438911b2bb09753891eba70d5339367707cddeb72734f912f0a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ca/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca/firefox-127.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f915d033d90cd92141744be393d87ff763a02b93b0d9019cdb08ad71e8875998"; + sha256 = "2eaaaa67d02e15ae63e629ee51c0eea1fb305a7a58d0493e08bd780bdc532488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cak/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cak/firefox-127.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8e69658669438c24e29f5cd6ea31109b15b8bee2d65866ee70d891b1524c2df8"; + sha256 = "bbec0e259064cdf9337a160176b336ff27e1b28757cd862e6da92dcf2752d84a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cs/firefox-127.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "09d201730514b5217b24ec3c945784eb25196f3bf20edacf3dc414bf6d421e99"; + sha256 = "7b5fa6fb597ab7e2e226258e97480c6426478e774925098719135fcae93caf18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cy/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cy/firefox-127.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d37b0bc8331113539ce1a42ff1e14e7c418461ad27e6fcfedfc2bde668d3b875"; + sha256 = "be3f396e41fd49660dc739da888a472cebbfb2604a73d297d1f0e227a545631c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/da/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/da/firefox-127.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b11404d98763a12d3601c368c8ea3458e596a50c8b28b5a39160a8a65f9821cf"; + sha256 = "ce41505935ab911282d2f2e3b94c55b08622dac3c7f0f28d982217f30664c678"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/de/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/de/firefox-127.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2074038ef968a449ecfc4db5a95daa57d5750e0356af810def7831e0b28820d7"; + sha256 = "53d38a12dd1bcd2f9c2be3c705dff59a431eb83b67f99183f62277a03d08ea68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/dsb/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/dsb/firefox-127.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0185438000780f3cdf0fb70ac624ae26d62ff13baaed27c83031a6e80c4b2197"; + sha256 = "ce1ef936bcf93eb5068d35a6c9bbecab34c6f013319dd81c6197e02dcc4a0a35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/el/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/el/firefox-127.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a859650d0c103293d48b7faf8b5f147d93d85f8e6d0a0837d4a770815f5a772a"; + sha256 = "ee2623c0dcd6419bc8e306b4e31d73bc554ac85ac0e71236d390d9c199f996f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-CA/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-CA/firefox-127.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7c2ba78c44ddb5766d3a243955e7f124860d66a08c3c9e8985e05828fa8bd8b4"; + sha256 = "d0b56528926ac55de06f7210dda2af604d0f2b59d632c54cd12b0a061d4660e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-GB/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-GB/firefox-127.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ffa47fccaf562c5b9283c62beba604613da8c14ee2a7bdf3b02369a08907d852"; + sha256 = "e860d7a7a66e2b8ccc8f8a31b1bd6c9fe80762e1e15c99918100504411fe41df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-US/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-US/firefox-127.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1e6b9cad1a6082b75a0aa8f27c0031a09c7b4aef0a2dc42b66d78e319ca45592"; + sha256 = "825248c30801f7b8cb271cd9725a699c0b3d68bdc176d58a46af5032ede4dcc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/eo/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eo/firefox-127.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "704a7bb203752638e637857fd1575bf780c811b202f3d915132fbd140aadb5c3"; + sha256 = "965369b3eb67330f3a8dbda2e20811f7236a0ffddad2a742235368fa995237e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-AR/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-AR/firefox-127.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ec556966e0cc3baf26bd69bfa8fc95d05a5ecf327b51f5d413dc75e8d57abbe8"; + sha256 = "0a1d0dfc416b8eeef96b79df5a4b5443763d728cf13eaad8cc3a070149068545"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-CL/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-CL/firefox-127.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "2b3428d8df4199f57cae938e2042b07c87bc15fae08b4c6f9320a93cc2accf10"; + sha256 = "4cb753e847f4c677faaa6683ec78f2de59ffd14e1ce2a67f2b09ca8710126910"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-ES/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-ES/firefox-127.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2d763335b0a440b486d3a7787ed327f76a8dfb793dfcae4c011865af229142cb"; + sha256 = "affd43cef6f9620220274af159c510d63b0bd86a7aa0bd856c8f4e33a822b0d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-MX/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-MX/firefox-127.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "807a5f264e10bf2d7b7f402453f59986ec9388e81daa1226e6c3c57fce600591"; + sha256 = "689e02820959797262a7a66044f0af9119c20aafb7373409cbd8846fa79e7a88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/et/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/et/firefox-127.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6d345cd400c33a0abf0ef84133dc758043dc6456c1685399ce008636d0c0c317"; + sha256 = "0323c8ecc0c39cf71e1d3e8ef9624ddeb6d8f9d65f1758b7e274309a40d5fd9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/eu/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eu/firefox-127.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e2b892bb928ece432b234b5fabb6ef4c5d87beffeba5052ba760f1459d611794"; + sha256 = "3838fddba1cf529fe02dc7261194c083112fbc9344c8804611d9e24a7d4172d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fa/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fa/firefox-127.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a0437c04c9ecf5620da2c680430cfd45c23e2507b83f7fc564ba6b8702b5b652"; + sha256 = "6e6fa470798f9a048a12624f8ebfda5a174c3bc86f76552965c5bebf22d6b803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ff/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ff/firefox-127.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "0b94d624b691d9db36e7fa5773e9bee515361f2e5400f34b7eadd181c37ad8bf"; + sha256 = "051b1b02423188025cb916e68c61deefb02b0588e0630784411a9d5c3d36365e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fi/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fi/firefox-127.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "54cb7a05dcdcc1ad0a87f232d55a2833e4e21282035d92b31f8268190cf2ccf1"; + sha256 = "087d6b66e48b50c5d13385ce850614324a857cbf2439cf29c4ef9730fc4cf3da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fr/firefox-127.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "48457fff8307cd2b1066448b545c1971cd084109a27203f660328560dc739e7d"; + sha256 = "463bd8478a07ec397c678614c3a80a762170a3dd0b5a378a4fab77931b0c0144"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fur/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fur/firefox-127.0.2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2f4b6400b06afa4d80f4c7426914775816f775502d087a75d8b6ac87b8e69242"; + sha256 = "960dc76265a02dabdf84a660d6fad6486eac1aeaa1f60bcddc97a0e138f462fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fy-NL/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fy-NL/firefox-127.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f3d68d1caeee683cdfbd8bb64e621c2f73d727ad92f4f0f7af916268b5455e3b"; + sha256 = "3aa004f2114f24c435f53231f48a4e294ee43a4211909c0160c377d20d9e0e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ga-IE/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ga-IE/firefox-127.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "97b4f549e6c1f20a81728f5a839f16959d17ee4e6018fb21118433caaec4387e"; + sha256 = "d8b3829c838ba4374f044b477e7c5f3b569fdd4211266a8530dae2a571496967"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gd/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gd/firefox-127.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "61c767f4f08cec1ff08010b05c917fba22fea771ee15b82bf2196037d2b75a4d"; + sha256 = "290030ddc0271faacf82e9c28a6b39b04f5ec3a1a2f3d6ab9500043760eb1d8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gl/firefox-127.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f6376af7b2b56a757a06c38d4a5974c8001ee765c2bf0e5900351a99d9a57689"; + sha256 = "d1b185fdeba1bb8a8001deebd4b1901b8c2bedbe6f83ab7a62afdea0812a73f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gn/firefox-127.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4e9014c87d79bfe6243271a1ee7a8c728bab79420dfe8ca92ba310757d0a1c05"; + sha256 = "876e0b5a5cf938af23249491cbda56cdda4f41bf9094be6e509805d96b8885d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gu-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gu-IN/firefox-127.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a6b122c076fdeb82f5bc532352f0387876f9edd767cb99a5447347006b001862"; + sha256 = "034dd128c5d5b1bbb341dcc65b6a575623ee544f5d7319b0b257cd3554ce2cd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/he/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/he/firefox-127.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "79c827200537fa42597d0f932a7d68ee8779bfec1d18728539f1a7dd5192d9ac"; + sha256 = "68636a8d11c9abc1c24e621a966e4f00a7064e2b9793c9f6ecb09c36781c28da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hi-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hi-IN/firefox-127.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b1fbe1760f130ab92236eb4a5ea7e6b0d0518b35157f36f4eafc492c3f9cd0ae"; + sha256 = "8219e7cbeece71af3c87ccc92bfac707d4e97041e3dc0360d816b47b2490b1cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hr/firefox-127.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "72889a867d9421fc73d9d4f180849d805b01471bddaaa6824e93b07896a768b9"; + sha256 = "b7245d5b926be172976d66815676bc44489f45797b3080966690c3eecfde22eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hsb/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hsb/firefox-127.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "48f07c8429a713dd89ca3c0b4d1559f1eb321f6b39a7e0c3e99879af81145fb7"; + sha256 = "7e76beca927640092ae2bcd58b7fd6bd0174dc07dcd847335d40a7c5a831b99c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hu/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hu/firefox-127.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "34d359ea9ff40e7769836aa9738a44d9ea3a4a56d1f24cd3c131377b3c643c20"; + sha256 = "077fd0c025277e2fcf64a673e5ef32732f2c1d6c44ab1ffa02e7a542466b8807"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hy-AM/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hy-AM/firefox-127.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "81ff340957317c3e897802270cc518a6958498cd0d2633ea05f8dcaa47f160ac"; + sha256 = "ae478b9d6cb6cb028f5644d15a95c1b495699e9d1db31c9165f8787c40bdd2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ia/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ia/firefox-127.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "774377bf071b1b9d8f7fc04bbe3d654d03a4f42aff49703d1ec1c385a95c19f6"; + sha256 = "9b4fb99f9447ba2712edb296f35deaea72371406fa592a8937d14c8cca1c015e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/id/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/id/firefox-127.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "5f487dd5c6a71c89d6064b77db21fd114e3d7cc0ae0286d2aadf595f32ecb7a3"; + sha256 = "849ae2d09de46a7f959af6b98d4de49aabfcc40fa8a672832f15509f8e0c0627"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/is/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/is/firefox-127.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d3ff61dacb107101e468d4409a9a3775e10263580a8b494ca49e7eb633d5a569"; + sha256 = "4ab5465ebf5d6eff987ce883146ee40ec8dfb45aebf7a8801cf938335776acf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/it/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/it/firefox-127.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3da83fff962bb1d9e6bae213fee223b3dc5929ca6ed69e837cc645038eefd950"; + sha256 = "de70b14a007dbe09888a824f0e71ca3951f557a00a4b377f7ca4bd80558b22f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ja/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ja/firefox-127.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "95a398384cb431048fba43f4651e7590433566ee8f2d7ab45c1d451cec554fd0"; + sha256 = "c8ff213cc59f0bca39c89d0a8167db48603a86623e6204f288c613acc6aaf71f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ka/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ka/firefox-127.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bbf9f1a734548b1424328190c69f82e2d07527dd89b5e79555751496420e30bf"; + sha256 = "f9d04949766ce80414059f7c8dbe0782c77b81e2b37b6ea8d906dce1a41be5b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kab/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kab/firefox-127.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fc1d3bd0bfb8ba3469d5524e3339f8ecc28e705a29b39648d45727a9f174a55b"; + sha256 = "f393d8df2412edce4713abcc0aab4d43b4d15e146f83956ee2c180757d0843e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kk/firefox-127.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a4776c548c0101794fba033dd5cf75c81997431ba3e34ea68875d5cf60b38851"; + sha256 = "8805bb373f8325479976817ce50431e01371a1ec436d74194d6677d168539656"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/km/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/km/firefox-127.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "18b272504c1dcc6b4019645ca3165653d7461ac8b2eeaa2d207f1bc158c383c2"; + sha256 = "adf07e405ebe47f7f3d0033ac9660f28331a63b90fc5d909134be53f771e0a4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kn/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kn/firefox-127.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "bfed658aad6e2575d348798a227a233e66cf39e85e4e4f66312650d6190f6016"; + sha256 = "2950df4ec7f7aded583b696779313ea94fc0b718c3b10ec4f754adfc0f65471e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ko/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ko/firefox-127.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6284657e60f24a5b34646c88918d67f52d8687da42f4c475bfbf1fe0afa8d524"; + sha256 = "6eedea929d7d73dce79c8f79632efce1e0591bd52948bbed468bc5240baef05d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lij/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lij/firefox-127.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "2041aca3beed2a7090b99bc5aa83596d83d8039127b266f905602a32cb63c690"; + sha256 = "f0f20a048c694f8bdeb70783476fc6f91b4f7d2881093cdc5d0f9f3a12d698e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lt/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lt/firefox-127.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a66df9b76bd7b40fb26b4dfd994608ff539bfb7827624c27cff69ffad0c7ba8e"; + sha256 = "6762ac48b93aaf619f3e1c16d1b2e5d75596b3c8fe4d374e563f44d377de4127"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lv/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lv/firefox-127.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "aa5cdab8803d15e893c3cdd2a4eca2e765920809d628e7e51d8478de3253951f"; + sha256 = "5a3fd3b8afc54c4659194ca479b71bd19371e3fceda827c1d93e4f86f7b69156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/mk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mk/firefox-127.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "697546a7551cc1e75f2dd82b152c570220def47db1a74ec5ee39f22487983b8f"; + sha256 = "370271f309ab7512ddec0b20e4be5765c5ef664680ef98d89fb2e263ac304f73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/mr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mr/firefox-127.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "c7fb05edd5ed4b3e73b4f9df701ccc87bd2ff608c9365aae92bd2ab32271cfaa"; + sha256 = "9d0b181157bce40bb76e34ba8c555b1aacdf86e286124a5fbfbfc678bc58cf66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ms/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ms/firefox-127.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cc6ebd7d7238798cde974e1ae493245f5d41ab14e6bc84f56fc44e42718efb39"; + sha256 = "d9749603debebeaa7df69ad2826df95ed1fc9389fff53f1e362d33b1578e31da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/my/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/my/firefox-127.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "7beec8da14f4920156c7a9d6a140bdc06c5a3dcac8c6151750b9c102f47cc335"; + sha256 = "4a2211461b601c37f3e8ca7babed6ac421cf49604146ed5bc5877cf60e0591bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nb-NO/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nb-NO/firefox-127.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7e700961054ca2d953fa839d948293854cc02d5e1dafa252ef7edc3bf52026db"; + sha256 = "ae5261b7c1e1075af26077012291a90614c75c56e044e409a10d84c50e145c6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ne-NP/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ne-NP/firefox-127.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ac5c875d87853a5d017b09641d828aed7ed3f1a6d35452c63ad222378fdd0368"; + sha256 = "ccee7bffdf331b7d35f2f14c18c4652f41f52fdcdb8e5fe1b5650ce65469ddc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nl/firefox-127.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "01d1459f0bbd32d2e61c35602535c0d90e219a55de9ef80ebe5f0d208fd52c3e"; + sha256 = "04fbe94b04a688d732235cd1dcef1f7e1087d3b85f04699153f80a4c44c8ad9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nn-NO/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nn-NO/firefox-127.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d27f03bbf71bba943a8ac8f0c98493fb8fa1007c249b3385f10e6e38b739f36f"; + sha256 = "59796010366cb0ef66a1a59bdb40383abdd8f921c60f6b998f38db8c86255dfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/oc/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/oc/firefox-127.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f3daf530493a9ac873c439bdc74db1ae9d54fad808c960334f948c531ae43306"; + sha256 = "3356edba3d3a324d4dc331bc3bef240d5245fc9a91b6dadda84c365a86b3457f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pa-IN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pa-IN/firefox-127.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5e04e0ceea94afc0e1e605322db7580cab1e990de1d337264eb27c3ed07a2fab"; + sha256 = "d7bdc84b081f91aee7db9161904d7c6ff0a1a8897d419aac804eb9d3a753ec7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pl/firefox-127.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cafddc502157e74e90f8fba5f46c9aa69bccb2c0bfcf23378452cc0307e09204"; + sha256 = "ee0c317681a149912381f8914acef222c643f47f35fd239ef495395622d2f605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pt-BR/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-BR/firefox-127.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f671ed2a8e9c50487db012eeeb8fafc92a4751dfd5c583a654ee84638352c1d2"; + sha256 = "18201b51d0f954713e5b2179dd3b934f46a0fb14d5b8decad4c9413814c33eeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pt-PT/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-PT/firefox-127.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ce23166b61ba00a56a6691c8ab073983523fcf949fef01c1c468a7b190a260f6"; + sha256 = "10281f85b6683b87a1a30cd4048929099ae7783755d15748a8fa71dfaa488760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/rm/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/rm/firefox-127.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ddfcba1b9992e8fb03ced07ace63adc34bb26076ebb838f188bf09bb6ab0b3ef"; + sha256 = "af7b78a46c9cd7320a240c78323c1e08c6619c280a4ba607647e357ae764ddb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ro/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ro/firefox-127.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "34a268c70aeae57e2ad079ea26da84746c8d19dd0f0d3319a22c697d4ae78adc"; + sha256 = "dd1062119e93cdeedd2872165344146960ac7d84bba456edeaf1628bfa75beeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ru/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ru/firefox-127.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9536e8df6d810ce925ee032f2a297ed7c66a6cec12d743092bd6e6cff8f208fc"; + sha256 = "817b50cdec921e3b1f11726bb10ee3e1e53b40b748085fcdf589df76ba95ac5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sat/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sat/firefox-127.0.2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "0a22b550ebd4620753e3151df23c5161eebdb6ad006cf7af5c9cc48153c0a0fb"; + sha256 = "f09b47829fd36bd80f3c4d564a6a4b96d8f8db4a86ba96818d44f432908a96fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sc/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sc/firefox-127.0.2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "a1bee2a69bf591c9b7e802e5eb2f115b27b02c8168ed6e81b80aa3952669789a"; + sha256 = "6fd2c2c3ba7c28548de56c7cb29737635d16b7f1b8d8f45fd9a7e98bf5f244ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sco/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sco/firefox-127.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3daa935271e5c569b7d8a115720c13e1366185a89da15680396587823d7f3dce"; + sha256 = "02cc81f6abc80db0ce09c9010974193786f0199be95e64c6cf510c02934eada8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/si/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/si/firefox-127.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "2cd15bf9a72b3480a2bbc85b6e5119d873dcc428e1f5b67eebbb67513743b823"; + sha256 = "0c11a867e5aa9092d021b89543bfb0b73dce6253bd9dd3e9db57b924048ae81f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sk/firefox-127.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "38b73f9ae7127e85ab6b86798eb16294281a8aff356bc3a2e73374ec0d81639d"; + sha256 = "b4352e3d8ae1782c0ed93118168626d17a7b259d9b6c52010240a651468208bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sl/firefox-127.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "77b7d3874d4fba89d09de9daeeef67a7dcad39e0a6d210a8c862f549bcf66e47"; + sha256 = "b77650ba96f576b2cf3de2477915cf3b5806a75950fc3e5f65265eaf06c6326f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/son/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/son/firefox-127.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5c44abd114aa9e72e20c33b672801169676cc109798404e8b810ac3ccc472bdd"; + sha256 = "5f5c0ec8e746094845fe3fec3577003ca20670a4e0b3fc66cf6b4df81d8b3b21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sq/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sq/firefox-127.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "32234c70aba6c5c7e0b9dbd712f63d8e59db130ab4ee8d71dc349997bd018dd5"; + sha256 = "cada2c2e6a9b3c7f1042030443bc89ba50a2ca11b20bd2f11ba51c360aa97dc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sr/firefox-127.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "f2cdaaf86c87c988222b49ce2029ed95a160313475c72891d404bcb87368c419"; + sha256 = "fe0d9aa1bcb3533eec8d5b1bf16da65077a5878cdcb9e305436622ee7bf7314b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sv-SE/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sv-SE/firefox-127.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "99beb21876bf87123f21b4dc5dd7bb77cc181b86359abae4c45b6749e804170d"; + sha256 = "b485b5d2c7ea7a6447457062defe528aa3ebe719c58449e16e96f7f1d1a08727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/szl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/szl/firefox-127.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "12b10f010720db1034207dbda6fbbfc637f7ed60aae2298ea710d3d2db2b9658"; + sha256 = "eeae99cd1f2f4f34c90e384697a3853d10c09343d2325f97fd71534a9e0abb70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ta/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ta/firefox-127.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c3eeb79eb2e7b7a0dc4951dc9b54b25153c478e9ca86050cbb57e213f5b4037a"; + sha256 = "b094294592daeeb1f44aed69ce3c3f1eb30bee87448c18f6c7b40d56bf0f817e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/te/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/te/firefox-127.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9d32807aa8fed63486fc821b61732206a5e6b1478027bdba68ae46591b165186"; + sha256 = "8900d8ea91871843d5b2af4ec6ce375ef7929e7922cc33dea1c18454f9aa461e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tg/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tg/firefox-127.0.2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "5168ba7ba0ee6d0b8452234e2cc25529433d0a34eec04b48c43d19358238ee25"; + sha256 = "6e5c773d4153dc4a712fed7ef36b174caef3ff3f11a387da55455b19aa42c85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/th/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/th/firefox-127.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6066b46716c3a0da86e8342597dab33b28ff8a9b02ed5dd2c5ebad0014aa29b7"; + sha256 = "c6df131d396ddd81b200720eaf2033f5555089762e9307388c0796ca1904cdc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tl/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tl/firefox-127.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b5a33ebe340aafad7fc4c8dff21f947ada60c517c873f96ea659dfd685e79f72"; + sha256 = "c48c82424d10ffd93fc39f30b6c286931f5c892fd24fec1b988e7255c2d61192"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tr/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tr/firefox-127.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "52b7df2f462ddaa82c3d2d04e7135fb5ce5f18802bd095dbd98b51d52161d113"; + sha256 = "b1d43c2921a0bc9771e3a202d14b2d6cfef6d3a0617d72a2dc866c4d08c9cc07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/trs/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/trs/firefox-127.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2f98be6cac9542efef5c0b8404143afe46beb90c702426dcd9b4bf15d8b3560b"; + sha256 = "9b93f3bae0d3288c46a69adaf24c028e69c819e81f402b3cb3cd119297bcec88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/uk/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uk/firefox-127.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f5285b7a5dcefd46717cbe5bbbe9e58b6197ace0ef77a3c6bd4e9661cd49c6d5"; + sha256 = "2f535154137303050fc6d1f29d61e28d7156c0b41d1feb0b3df3cb4e0ff66cbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ur/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ur/firefox-127.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2f90f140ffb61f3990bed58bfa238aeccb7b4bc9364b3fe892adfedfa1eb1b08"; + sha256 = "2607a196623e8b58e74930bb5f4cd188d105957441078e32a8273d6edc872a19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/uz/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uz/firefox-127.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6efec5797d0e1cb0ef5971d5de550029a507ff8337d3f33baa14ad6cde638040"; + sha256 = "a1ee778cd7fc6ed36888252279cd33ef354a9dad725e35a5929ca1a6d457c2e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/vi/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/vi/firefox-127.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e0a9d3a491019eca75690c814943c326cc3403d1fda9321c7103f38e343a9338"; + sha256 = "4e587db961e4269a5de47e81603effab87dc5adecfb2b61cb442c520e066d068"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/xh/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/xh/firefox-127.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ec0e2949de14be425f8d621599a710d1b9e17d0dfa657693f3ef15c599dffa7a"; + sha256 = "5c550ba6a8b7e9b518f3e538d6e9d87cbde3799fd1e8d1d4bcc293f740a9b422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/zh-CN/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-CN/firefox-127.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "769b437188b4b0869ee385e74898598e07c98b251a948f7a85dd970260540f12"; + sha256 = "30fabea5d68f18b4818bdd5ae2290f4630d95218fbbf34e1799f321e35f978f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/zh-TW/firefox-127.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-TW/firefox-127.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0ab4ae5fc776cf44b88237fb84c5d13e4676bf330c07bd8d1b3a1d220d12292e"; + sha256 = "77d96850c2cc6fa3ceff3d8b8c01d06969c2b71df4cf3b417e7e5519db78b40b"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index c34124cfb1..1207a7f024 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "127.0.1"; + version = "127.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "13df770a89b703033601cab56892a2fc62427521936b366893008e68cd1f48d7b18917a3cede23764d024208819037ad0d28c2d4b73b99fdc204cbd53bb1297e"; + sha512 = "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b"; }; extraPatches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix index 46e3a5cb4a..95820bc406 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix @@ -22,7 +22,7 @@ writeScript "update-${attrPath}" '' set -eux HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --receive-keys ADD7079479700DCADFDD5337E36D3B13F3D93274 + curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import - url=${baseUrl} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index 67fed12e16..4d679853fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "127.0-1", + "packageVersion": "127.0.2-2", "source": { - "rev": "127.0-1", - "sha256": "0zif9b7ky423bg3cf3njyxl465hrbsha1f1hxpdgccql0id5qr7r" + "rev": "127.0.2-2", + "sha256": "1f4xz496x1nf7lmvk50hakj9p6q0kzxl5f9s2k0b6kczvyc8gw5n" }, "settings": { "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2" }, "firefox": { - "version": "127.0", - "sha512": "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291" + "version": "127.0.2", + "sha512": "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index c52cb3f44f..2d7fcfecbd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "126.0.2592.53"; + version = "126.0.2592.68"; revision = "1"; - hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; + hash = "sha256-ThWtnWF7iL0OEq7+yA7vCowGZrjeiLx+d+Nff4Bwl4s="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2638.2"; + version = "127.0.2651.2"; revision = "1"; - hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; + hash = "sha256-eYCxGMIjclqFxOy6AyLKN5DJnplq/Vf3ClYbYWV3HAw="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.92"; + version = "126.0.2592.68"; revision = "1"; - hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; + hash = "sha256-btpUMmgZ9SQL4WGKynGA/dL/8Ve9hdjoDNsBNxG531Y="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix index 46e09803db..06391355db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "19.0.2"; + version = "20.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-MyQiq2Lo/XtmJ7D1VZXncYWq53Bu3O3WBT/PkdJuEZM="; + sha256 = "sha256-2fzxEqOGPZnA+nizLUq73f18bKDpDNglUt4RIz+VnS8="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index bfb40dc9bc..358da2082c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,7 +26,7 @@ let stripRoot = false; }; - version = "3.2.0"; + version = "3.2.1"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-4eGRG5VWI2rKpZ0NGYbWFHlvs2Zz0TljwhZYzWSh8DM="; + hash = "sha256-AqevKmxds42HsiWwuEEsgNmDgzXzLQ6KOPbX+804iX0="; }; # Needs tox diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 4b97d01e9d..3eccc3e016 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.7.3329.41"; + version = "6.8.3381.46"; 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-jDAairYILLLiMssBvct+hZ1D2sqTsvV43IxF1UdlwpQ="; - x86_64-linux = "sha256-nipvNDc+iHIupUdl2kQIDJhUyVP/dFAUJiAN5jBY38M="; + aarch64-linux = "sha256-OR79+Y2z9b8aE5WecIlbJsJx6wdMDnlWjCE9HYmOfn0="; + x86_64-linux = "sha256-F8HibI1fWI0nPWaXDNgrSHcp2iTuC9LZhble877zrMg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 778914763d..dafc914c1a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -4,11 +4,11 @@ # downloads at https://vivaldi.com/download/ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "114023"; + version = "115541"; src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_37.snap"; - hash = "sha256-l1eHTAJvpkWof7Yj7M5uaa3YdLWw9F+/QvIUAfBx3ow="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_41.snap"; + hash = "sha256-a1peHhku+OaGvPyChvLdh6/7zT+v8OHNwt60QUq7VvU="; }; buildInputs = [ squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 59e0f84364..0d42e228b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.4.1"; + version = "2024.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-rDw25kFiD16xma/LozGjlc/Tm6hoRYzHs8spTk6HU6Y="; + hash = "sha256-hgZ9+ltS7y5nOPdGFnql4KzgBXh5zgAfXLJy8REOY8o="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 60d3be8445..aad4e6807f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-b1oaLVwom06XUCjMF3/O/SdLt2s0MFuF+et6+MO2jBQ="; + sha256 = "sha256-5ly5VJSXIo9s2ilWYhf5FJij+tcITd+rmYEKFdFrq44="; }; vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix index 3e9dbe040c..cd37da1af6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.81.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drreGXCYpjF1UD1OUzuGh2rezEhHw7Zq0Y6JujLsMMk="; + sha256 = "sha256-FIl+SWYK8+OLuynhma7IG2fozekhGZKK/t5RgD+eTtA="; }; - vendorHash = "sha256-ojl+dGrj+zmE2lqlclq3jA0K6AXdi9Ofhd4GA6nVrDo="; + vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index aa1e18fd5c..dc127640f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.6.0"; + version = "7.6.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-buhRRgwCOVTnlVLzAL4T9ymgMTIcvelHyv6mfPK61eM="; + sha256 = "sha256-A8IRxt6bEDKZwzLCh+O1Z4vwyee5rMCqrCoSplGkPIc="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 7ea0c3c690..3de93c9369 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.10"; + version = "0.16.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw="; + hash = "sha256-muIVjT6ssNejp5O8ju06h9e7ZVcfwXyHgQIa0IEP4Xg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index 6026cf0290..4cdb78db4f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ZZkDc5INjUoNc9zcwbOa9WRIkkLr9bm3mohsSe3tKI4="; + hash = "sha256-CqUAySELc9jMQD6+BCgnvajEDv8FjU4Ita7v0EFrPug="; }; vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix index 9ea1600bc0..3cc2673508 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-aS7THDTpfNQPw+70ZgFzvurpq/vMKE6xSxJ19ERbtOA="; + hash = "sha256-yM4opOrHH0NQz26yHuzQfiXdWc8LbxAaqxXQDFdUb60="; }; - vendorHash = "sha256-5VsJ3Osm9w09t3x0dItC2iWwbPMf/IIBOSqUfcbQKK4="; + vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE="; subPackages = [ "./cnitool" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index 7a9cc60736..65b4ddd2a7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-MRnG2zqPSBPe/OHInKxGER350MuXEqJk2gs6O3KQv4Y="; + sha256 = "sha256-WWFp8+/KcdQZMvA/krWJsTf3we3+KFARcibXOeeZvc4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index c492db4688..6f74be61c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.16.16"; + version = "1.16.17"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-N7Yao/lRyzmbFDIqfvQoZXKGbYPxlA8HCD3tPkl8RKk="; + hash = "sha256-18ZvxXAE83/NT/Syv/wshTiulTMroAaamxYtfuYIuR4="; }; vendorHash = "sha256-wLB+sUaSOBb1VLx/iwlU4U6LKakUP+GbhdWfjlvCu84="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index e0bf652558..0b97512e59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGo122Module rec { pname = "helm-diff"; - version = "3.9.5"; + version = "3.9.8"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-6XkiGSbZzkYnqaHcoZQckADGVcWmSWL87MVzqb98lMQ="; + hash = "sha256-HGQTnvtL9hksy0B9U6jK8kkyoc3g0lmuBRV3vsg9Yao="; }; - vendorHash = "sha256-E0ERop/TBr36sfTKCD+DdZwHSkhYdGmvKoJF2gl3gwE="; + vendorHash = "sha256-4bYepEVeVg+X0WicktE8BorwgsLGh2cZUn8rgfMExpk="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4b215f7f0c..c54c0312dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops }: stdenv.mkDerivation rec { pname = "helm-secrets"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -m644 -Dt $out/${pname} plugin.yaml cp -r scripts/* $out/${pname}/scripts wrapProgram $out/${pname}/scripts/run.sh \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]} + --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops ]} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index a4cba0629e..c853fb2dc0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-KU0AvGecEvbkQ6PSjCMxpisx5UsFr1gLYXL4GzJ6zrU="; + hash = "sha256-tw9G7VhrBMdSbZ4ZZgMlKEDfhZE5dSPd2HUgfkDA8vo="; }; - vendorHash = "sha256-arY8RLlHCPgRWnk6LLXlORiLr7afJj4OhfPMA+9UQ0M="; + vendorHash = "sha256-Fso55G5j8MUQSqhCr6BT8epwgV1NznQXkPPQFL9TZFw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 86516de274..9215ea9845 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-bFNlNNc5PGim2yCX8YmWzPp1EzMrsSF3d/E+mf9Pw20="; + hash = "sha256-lZCD8hBe6SKKjTvEKNg/lr7NXrAPqFQoh9iQg0O6jhc="; }; - vendorHash = "sha256-pKvb7pKuGfa8Y+FvLwyWcYuuSszLin2+jFCQ7cPkkwQ="; + vendorHash = "sha256-FobBn7rbRVfnW8Zd982vkSuKpPj4gGK4b41o9OK/CCY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index e06f394df9..6e07b2658c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.29.5+k3s1"; - k3sCommit = "4e53a32306759581f4ed938bcd18b6fa20b83230"; - k3sRepoSha256 = "169hzl23chs4qblicmqj3j10jg1xdq8s9717bd3pzx7wzz9s9mqw"; - k3sVendorHash = "sha256-QreiB4JMtfBjHlkAyflQAW2rnfgay62UD6emx8TgUpM="; + k3sVersion = "1.29.6+k3s1"; + k3sCommit = "83ae095ab9197f168a6bd3f6bd355f89bce39a9c"; + k3sRepoSha256 = "0gv7xh08mhgc2cyzpsvdi69xknifcpdy6znbim6r3r4lbcw2bkl9"; + k3sVendorHash = "sha256-OiZLUjQUCwso+NHg3aOrXx6/HSFOfwtzwVmLr/Fjfpw="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1"; + containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix index 22863c3ac1..a369bf0d7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-Lz7mCbEEiCmNPmJ8RkxJLEOOdyvLZl3pT3qL2/kHYuA="; + hash = "sha256-zyXxMp+59buSwm4fZY62b2xqAmq7XAzhET0qez8oWPs="; }; - vendorHash = "sha256-JJ2B9sUrfo4fiRsxA8mBjvKP0mduIZMaGN8gFC1cTA4="; + vendorHash = "sha256-6RrnsRbQ1+Cx7vnqauisBICgwmvTpJQT32DnIDVc6ts="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix index 3e5b25a16f..c36bab5734 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.16.0"; + version = "0.17.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8="; + sha256 = "sha256-jU/w4SA6gt2xCdJiSNkY2S2RQCuyj84IW1w8DDPvtW0="; }; - vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww="; + vendorHash = "sha256-OXmT7GTnD/TKjCN4po3vLJ0pZgsEEUGnuF5RtOm00hM="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix index c76a160776..4a68ce6468 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,20 +1,16 @@ { pname, version, src, meta, appimageTools, makeWrapper }: let - - name = "${pname}-${version}"; - appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src meta; + inherit pname version src meta; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} 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/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index d32445c645..5199400cae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -94,7 +94,7 @@ let mainProgram = "nomad-autoscaler"; homepage = "https://github.com/hashicorp/nomad-autoscaler"; license = licenses.mpl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix index 9ab5082f61..f907f68914 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.15.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y="; + sha256 = "sha256-zEN8yfjW3JHf6OzPQC6Rg2/hJ+3d9d2nYhz60BdSK9s="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix index c8152edce3..f24ea1ea27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-tF4MIWHn9NvuZ94mwEujUNs34lvbnmH7oc7ur/jbd9c="; + sha256 = "sha256-ypl8P66SEoHpaqAgFA90bJmiVvH4SvymCMVz1o9x9mQ="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-vqchVDAw63QyG8ZL2n+YGcMjVt8IUxkFUPHpWt0d/Qk="; + vendorHash = "sha256-Tl5o/ytwdGT0bSa8ep7YSaSMM9rk8+Zx1SFgFGh9u6k="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index d3c0e1fd3f..f717ec9226 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix @@ -77,7 +77,7 @@ in }; spark_3_4 = spark rec { pname = "spark"; - version = "3.4.2"; - hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk="; + version = "3.4.3"; + hash = "sha256-ifeytk08oaEyiEawwWbUWWuoynGTJNvnrkOW/CjeaSk="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 1890a26d99..df4457de8e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,22 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, go_1_21 }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "terraform-docs"; - version = "0.17.0"; - - go = go_1_21; + version = "0.18.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HkkW6JX5wcGElmr6CiSukyeS/8rz4CUThy8rZfx4hbo="; + hash = "sha256-XZS+mGp2QsrKS3fPZd0ja4w/CAfPcyzSgwolQ+StER0="; }; - patches = [ ./update-to-go-1.21.patch ]; - - vendorHash = "sha256-ZHWAiXJG8vCmUkf6GNxoIJbIEjEWukLdrmdIb64QleI="; - - subPackages = [ "." ]; + vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc="; meta = with lib; { description = "Utility to generate documentation from Terraform modules in various output formats"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch deleted file mode 100644 index 2397082ca0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch +++ /dev/null @@ -1,2698 +0,0 @@ -diff --git a/go.mod b/go.mod -index b3035e3..701d299 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/terraform-docs/terraform-docs - --go 1.16 -+go 1.21 - - require ( - github.com/BurntSushi/toml v1.3.2 -@@ -23,18 +23,50 @@ require ( - ) - - require ( -+ github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/agext/levenshtein v1.2.3 // indirect -+ github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect -+ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/fatih/color v1.16.0 // indirect -+ github.com/fsnotify/fsnotify v1.7.0 // indirect -+ github.com/golang/protobuf v1.5.3 // indirect -+ github.com/google/go-cmp v0.5.9 // indirect -+ github.com/google/uuid v1.4.0 // indirect -+ github.com/hashicorp/hcl v1.0.0 // indirect -+ github.com/hashicorp/yamux v0.1.1 // indirect - github.com/huandu/xstrings v1.4.0 // indirect -+ github.com/inconshreveable/mousetrap v1.1.0 // indirect -+ github.com/magiconair/properties v1.8.7 // indirect -+ github.com/mattn/go-colorable v0.1.13 // indirect -+ github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect - github.com/mitchellh/go-wordwrap v1.0.1 // indirect -+ github.com/mitchellh/mapstructure v1.5.0 // indirect -+ github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/oklog/run v1.1.0 // indirect -+ github.com/pelletier/go-toml/v2 v2.1.0 // indirect -+ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect -+ github.com/sagikazarmark/locafero v0.4.0 // indirect -+ github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/shopspring/decimal v1.3.1 // indirect -+ github.com/sourcegraph/conc v0.3.0 // indirect -+ github.com/spf13/afero v1.11.0 // indirect -+ github.com/spf13/cast v1.6.0 // indirect -+ github.com/subosito/gotenv v1.6.0 // indirect - github.com/zclconf/go-cty v1.14.1 // indirect - go.uber.org/multierr v1.11.0 // indirect -+ golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e // indirect -+ golang.org/x/mod v0.14.0 // indirect -+ golang.org/x/net v0.19.0 // indirect -+ golang.org/x/sys v0.15.0 // indirect -+ golang.org/x/text v0.14.0 // indirect -+ golang.org/x/tools v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect -+ google.golang.org/grpc v1.59.0 // indirect -+ google.golang.org/protobuf v1.31.0 // indirect -+ gopkg.in/ini.v1 v1.67.0 // indirect - ) -diff --git a/go.sum b/go.sum -index 8bd57a4..3fc860d 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,1161 +1,5 @@ --cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= --cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= --cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= --cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= --cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= --cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= --cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= --cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= --cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= --cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= --cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= --cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= --cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= --cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= --cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= --cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= --cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= --cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= --cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= --cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= --cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= --cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= --cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= --cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= --cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= --cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= --cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= --cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= --cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= --cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= --cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= --cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= --cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= --cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= --cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= --cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= --cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= --cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= --cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= --cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= --cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= --cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= --cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= --cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= --cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= --cloud.google.com/go/accessapproval v1.7.1/go.mod h1:JYczztsHRMK7NTXb6Xw+dwbs/WnOJxbo/2mTI+Kgg68= --cloud.google.com/go/accessapproval v1.7.2/go.mod h1:/gShiq9/kK/h8T/eEn1BTzalDvk0mZxJlhfw0p+Xuc0= --cloud.google.com/go/accessapproval v1.7.3/go.mod h1:4l8+pwIxGTNqSf4T3ds8nLO94NQf0W/KnMNuQ9PbnP8= --cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc= --cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= --cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE= --cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM= --cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ= --cloud.google.com/go/accesscontextmanager v1.8.0/go.mod h1:uI+AI/r1oyWK99NN8cQ3UK76AMelMzgZCvJfsi2c+ps= --cloud.google.com/go/accesscontextmanager v1.8.1/go.mod h1:JFJHfvuaTC+++1iL1coPiG1eu5D24db2wXCDWDjIrxo= --cloud.google.com/go/accesscontextmanager v1.8.2/go.mod h1:E6/SCRM30elQJ2PKtFMs2YhfJpZSNcJyejhuzoId4Zk= --cloud.google.com/go/accesscontextmanager v1.8.3/go.mod h1:4i/JkF2JiFbhLnnpnfoTX5vRXfhf9ukhU1ANOTALTOQ= --cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M= --cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= --cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= --cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg= --cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ= --cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4AhvjcIZ/9/RRHy/k= --cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw= --cloud.google.com/go/aiplatform v1.45.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= --cloud.google.com/go/aiplatform v1.48.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= --cloud.google.com/go/aiplatform v1.50.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= --cloud.google.com/go/aiplatform v1.51.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= --cloud.google.com/go/aiplatform v1.51.1/go.mod h1:kY3nIMAVQOK2XDqDPHaOuD9e+FdMA6OOpfBjsvaFSOo= --cloud.google.com/go/aiplatform v1.51.2/go.mod h1:hCqVYB3mY45w99TmetEoe8eCQEwZEp9WHxeZdcv9phw= --cloud.google.com/go/aiplatform v1.52.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= --cloud.google.com/go/aiplatform v1.54.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= --cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= --cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= --cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M= --cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE= --cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE= --cloud.google.com/go/analytics v0.21.2/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= --cloud.google.com/go/analytics v0.21.3/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= --cloud.google.com/go/analytics v0.21.4/go.mod h1:zZgNCxLCy8b2rKKVfC1YkC2vTrpfZmeRCySM3aUbskA= --cloud.google.com/go/analytics v0.21.5/go.mod h1:BQtOBHWTlJ96axpPPnw5CvGJ6i3Ve/qX2fTxR8qWyr8= --cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w= --cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk= --cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= --cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= --cloud.google.com/go/apigateway v1.6.1/go.mod h1:ufAS3wpbRjqfZrzpvLC2oh0MFlpRJm2E/ts25yyqmXA= --cloud.google.com/go/apigateway v1.6.2/go.mod h1:CwMC90nnZElorCW63P2pAYm25AtQrHfuOkbRSHj0bT8= --cloud.google.com/go/apigateway v1.6.3/go.mod h1:k68PXWpEs6BVDTtnLQAyG606Q3mz8pshItwPXjgv44Y= --cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY= --cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= --cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= --cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= --cloud.google.com/go/apigeeconnect v1.6.1/go.mod h1:C4awq7x0JpLtrlQCr8AzVIzAaYgngRqWf9S5Uhg+wWs= --cloud.google.com/go/apigeeconnect v1.6.2/go.mod h1:s6O0CgXT9RgAxlq3DLXvG8riw8PYYbU/v25jqP3Dy18= --cloud.google.com/go/apigeeconnect v1.6.3/go.mod h1:peG0HFQ0si2bN15M6QSjEW/W7Gy3NYkWGz7pFz13cbo= --cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0= --cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY= --cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM= --cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc= --cloud.google.com/go/apigeeregistry v0.7.1/go.mod h1:1XgyjZye4Mqtw7T9TsY4NW10U7BojBvG4RMD+vRDrIw= --cloud.google.com/go/apigeeregistry v0.7.2/go.mod h1:9CA2B2+TGsPKtfi3F7/1ncCCsL62NXBRfM6iPoGSM+8= --cloud.google.com/go/apigeeregistry v0.8.1/go.mod h1:MW4ig1N4JZQsXmBSwH4rwpgDonocz7FPBSw6XPGHmYw= --cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8= --cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU= --cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI= --cloud.google.com/go/apikeys v0.6.0/go.mod h1:kbpXu5upyiAlGkKrJgQl8A0rKNNJ7dQ377pdroRSSi8= --cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno= --cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak= --cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84= --cloud.google.com/go/appengine v1.7.0/go.mod h1:eZqpbHFCqRGa2aCdope7eC0SWLV1j0neb/QnMJVWx6A= --cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E= --cloud.google.com/go/appengine v1.8.1/go.mod h1:6NJXGLVhZCN9aQ/AEDvmfzKEfoYBlfB80/BHiKVputY= --cloud.google.com/go/appengine v1.8.2/go.mod h1:WMeJV9oZ51pvclqFN2PqHoGnys7rK0rz6s3Mp6yMvDo= --cloud.google.com/go/appengine v1.8.3/go.mod h1:2oUPZ1LVZ5EXi+AF1ihNAF+S8JrzQ3till5m9VQkrsk= --cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg= --cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= --cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= --cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY= --cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= --cloud.google.com/go/area120 v0.8.1/go.mod h1:BVfZpGpB7KFVNxPiQBuHkX6Ed0rS51xIgmGyjrAfzsg= --cloud.google.com/go/area120 v0.8.2/go.mod h1:a5qfo+x77SRLXnCynFWPUZhnZGeSgvQ+Y0v1kSItkh4= --cloud.google.com/go/area120 v0.8.3/go.mod h1:5zj6pMzVTH+SVHljdSKC35sriR/CVvQZzG/Icdyriw0= --cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M= --cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= --cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= --cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0= --cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc= --cloud.google.com/go/artifactregistry v1.11.1/go.mod h1:lLYghw+Itq9SONbCa1YWBoWs1nOucMH0pwXN1rOBZFI= --cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ= --cloud.google.com/go/artifactregistry v1.12.0/go.mod h1:o6P3MIvtzTOnmvGagO9v/rOjjA0HmhJ+/6KAXrmYDCI= --cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08= --cloud.google.com/go/artifactregistry v1.14.1/go.mod h1:nxVdG19jTaSTu7yA7+VbWL346r3rIdkZ142BSQqhn5E= --cloud.google.com/go/artifactregistry v1.14.2/go.mod h1:Xk+QbsKEb0ElmyeMfdHAey41B+qBq3q5R5f5xD4XT3U= --cloud.google.com/go/artifactregistry v1.14.3/go.mod h1:A2/E9GXnsyXl7GUvQ/2CjHA+mVRoWAXC0brg2os+kNI= --cloud.google.com/go/artifactregistry v1.14.4/go.mod h1:SJJcZTMv6ce0LDMUnihCN7WSrI+kBSFV0KIKo8S8aYU= --cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE= --cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= --cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= --cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= --cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ= --cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY= --cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo= --cloud.google.com/go/asset v1.12.0/go.mod h1:h9/sFOa4eDIyKmH6QMpm4eUK3pDojWnUhTgJlk762Hg= --cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw= --cloud.google.com/go/asset v1.14.1/go.mod h1:4bEJ3dnHCqWCDbWJ/6Vn7GVI9LerSi7Rfdi03hd+WTQ= --cloud.google.com/go/asset v1.15.0/go.mod h1:tpKafV6mEut3+vN9ScGvCHXHj7FALFVta+okxFECHcg= --cloud.google.com/go/asset v1.15.1/go.mod h1:yX/amTvFWRpp5rcFq6XbCxzKT8RJUam1UoboE179jU4= --cloud.google.com/go/asset v1.15.2/go.mod h1:B6H5tclkXvXz7PD22qCA2TDxSVQfasa3iDlM89O2NXs= --cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU= --cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= --cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= --cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= --cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= --cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= --cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= --cloud.google.com/go/assuredworkloads v1.11.1/go.mod h1:+F04I52Pgn5nmPG36CWFtxmav6+7Q+c5QyJoL18Lry0= --cloud.google.com/go/assuredworkloads v1.11.2/go.mod h1:O1dfr+oZJMlE6mw0Bp0P1KZSlj5SghMBvTpZqIcUAW4= --cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2JKpVRgyG2op3jfa59Zs= --cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U= --cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= --cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= --cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= --cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM= --cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= --cloud.google.com/go/automl v1.13.1/go.mod h1:1aowgAHWYZU27MybSCFiukPO7xnyawv7pt3zK4bheQE= --cloud.google.com/go/automl v1.13.2/go.mod h1:gNY/fUmDEN40sP8amAX3MaXkxcqPIn7F1UIIPZpy4Mg= --cloud.google.com/go/automl v1.13.3/go.mod h1:Y8KwvyAZFOsMAPqUCfNu1AyclbC6ivCUF/MTwORymyY= --cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8= --cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc= --cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI= --cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= --cloud.google.com/go/baremetalsolution v1.1.1/go.mod h1:D1AV6xwOksJMV4OSlWHtWuFNZZYujJknMAP4Qa27QIA= --cloud.google.com/go/baremetalsolution v1.2.0/go.mod h1:68wi9AwPYkEWIUT4SvSGS9UJwKzNpshjHsH4lzk8iOw= --cloud.google.com/go/baremetalsolution v1.2.1/go.mod h1:3qKpKIw12RPXStwQXcbhfxVj1dqQGEvcmA+SX/mUR88= --cloud.google.com/go/baremetalsolution v1.2.2/go.mod h1:O5V6Uu1vzVelYahKfwEWRMaS3AbCkeYHy3145s1FkhM= --cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g= --cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE= --cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE= --cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= --cloud.google.com/go/batch v1.3.1/go.mod h1:VguXeQKXIYaeeIYbuozUmBR13AfL4SJP7IltNPS+A4A= --cloud.google.com/go/batch v1.4.1/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= --cloud.google.com/go/batch v1.5.0/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= --cloud.google.com/go/batch v1.5.1/go.mod h1:RpBuIYLkQu8+CWDk3dFD/t/jOCGuUpkpX+Y0n1Xccs8= --cloud.google.com/go/batch v1.6.1/go.mod h1:urdpD13zPe6YOK+6iZs/8/x2VBRofvblLpx0t57vM98= --cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU= --cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4= --cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8= --cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM= --cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU= --cloud.google.com/go/beyondcorp v0.6.1/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= --cloud.google.com/go/beyondcorp v1.0.0/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= --cloud.google.com/go/beyondcorp v1.0.1/go.mod h1:zl/rWWAFVeV+kx+X2Javly7o1EIQThU4WlkynffL/lk= --cloud.google.com/go/beyondcorp v1.0.2/go.mod h1:m8cpG7caD+5su+1eZr+TSvF6r21NdLJk4f9u4SP2Ntc= --cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo= --cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= --cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= --cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= --cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= --cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= --cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= --cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= --cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw= --cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc= --cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/ZurWFIxmF9I/E= --cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac= --cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9yBh7Oy7/4Q= --cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU= --cloud.google.com/go/bigquery v1.52.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= --cloud.google.com/go/bigquery v1.53.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= --cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= --cloud.google.com/go/bigquery v1.56.0/go.mod h1:KDcsploXTEY7XT3fDQzMUZlpQLHzE4itubHrnmhUrZA= --cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug= --cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= --cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= --cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI= --cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y= --cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss= --cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc= --cloud.google.com/go/billing v1.16.0/go.mod h1:y8vx09JSSJG02k5QxbycNRrN7FGZB6F3CAcgum7jvGA= --cloud.google.com/go/billing v1.17.0/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= --cloud.google.com/go/billing v1.17.1/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= --cloud.google.com/go/billing v1.17.2/go.mod h1:u/AdV/3wr3xoRBk5xvUzYMS1IawOAPwQMuHgHMdljDg= --cloud.google.com/go/billing v1.17.3/go.mod h1:z83AkoZ7mZwBGT3yTnt6rSGI1OOsHSIi6a5M3mJ8NaU= --cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk= --cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= --cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= --cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0= --cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk= --cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= --cloud.google.com/go/binaryauthorization v1.6.1/go.mod h1:TKt4pa8xhowwffiBmbrbcxijJRZED4zrqnwZ1lKH51U= --cloud.google.com/go/binaryauthorization v1.7.0/go.mod h1:Zn+S6QqTMn6odcMU1zDZCJxPjU2tZPV1oDl45lWY154= --cloud.google.com/go/binaryauthorization v1.7.1/go.mod h1:GTAyfRWYgcbsP3NJogpV3yeunbUIjx2T9xVeYovtURE= --cloud.google.com/go/binaryauthorization v1.7.2/go.mod h1:kFK5fQtxEp97m92ziy+hbu+uKocka1qRRL8MVJIgjv0= --cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU= --cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg= --cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590= --cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= --cloud.google.com/go/certificatemanager v1.7.1/go.mod h1:iW8J3nG6SaRYImIa+wXQ0g8IgoofDFRp5UMzaNk1UqI= --cloud.google.com/go/certificatemanager v1.7.2/go.mod h1:15SYTDQMd00kdoW0+XY5d9e+JbOPjp24AvF48D8BbcQ= --cloud.google.com/go/certificatemanager v1.7.3/go.mod h1:T/sZYuC30PTag0TLo28VedIRIj1KPGcOQzjWAptHa00= --cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE= --cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk= --cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk= --cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE= --cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU= --cloud.google.com/go/channel v1.16.0/go.mod h1:eN/q1PFSl5gyu0dYdmxNXscY/4Fi7ABmeHCJNf/oHmc= --cloud.google.com/go/channel v1.17.0/go.mod h1:RpbhJsGi/lXWAUM1eF4IbQGbsfVlg2o8Iiy2/YLfVT0= --cloud.google.com/go/channel v1.17.1/go.mod h1:xqfzcOZAcP4b/hUDH0GkGg1Sd5to6di1HOJn/pi5uBQ= --cloud.google.com/go/channel v1.17.2/go.mod h1:aT2LhnftnyfQceFql5I/mP8mIbiiJS4lWqgXA815zMk= --cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE= --cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U= --cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA= --cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M= --cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg= --cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s= --cloud.google.com/go/cloudbuild v1.10.1/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.13.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.14.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.14.1/go.mod h1:K7wGc/3zfvmYWOWwYTgF/d/UVJhS4pu+HAy7PL7mCsU= --cloud.google.com/go/cloudbuild v1.14.2/go.mod h1:Bn6RO0mBYk8Vlrt+8NLrru7WXlQ9/RDWz2uo5KG1/sg= --cloud.google.com/go/cloudbuild v1.14.3/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= --cloud.google.com/go/cloudbuild v1.15.0/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= --cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM= --cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk= --cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= --cloud.google.com/go/clouddms v1.6.1/go.mod h1:Ygo1vL52Ov4TBZQquhz5fiw2CQ58gvu+PlS6PVXCpZI= --cloud.google.com/go/clouddms v1.7.0/go.mod h1:MW1dC6SOtI/tPNCciTsXtsGNEM0i0OccykPvv3hiYeM= --cloud.google.com/go/clouddms v1.7.1/go.mod h1:o4SR8U95+P7gZ/TX+YbJxehOCsM+fe6/brlrFquiszk= --cloud.google.com/go/clouddms v1.7.2/go.mod h1:Rk32TmWmHo64XqDvW7jgkFQet1tUKNVzs7oajtJT3jU= --cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc= --cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= --cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= --cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4= --cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI= --cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y= --cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs= --cloud.google.com/go/cloudtasks v1.11.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= --cloud.google.com/go/cloudtasks v1.12.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= --cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38UaWwsnuBDOBVUk= --cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffSS4B8+BaBB5Ys= --cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0= --cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= --cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= --cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= --cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= --cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= --cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= --cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= --cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= --cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= --cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= --cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= --cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= --cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= --cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= --cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= --cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= --cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= --cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= --cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= --cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= --cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= --cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= --cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= --cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= --cloud.google.com/go/contactcenterinsights v1.9.1/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= --cloud.google.com/go/contactcenterinsights v1.10.0/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= --cloud.google.com/go/contactcenterinsights v1.11.0/go.mod h1:hutBdImE4XNZ1NV4vbPJKSFOnQruhC5Lj9bZqWMTKiU= --cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE= --cloud.google.com/go/contactcenterinsights v1.11.2/go.mod h1:A9PIR5ov5cRcd28KlDbmmXE8Aay+Gccer2h4wzkYFso= --cloud.google.com/go/contactcenterinsights v1.11.3/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= --cloud.google.com/go/contactcenterinsights v1.12.0/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= --cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg= --cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo= --cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4= --cloud.google.com/go/container v1.14.0/go.mod h1:3AoJMPhHfLDxLvrlVWaK57IXzaPnLaZq63WX59aQBfM= --cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA= --cloud.google.com/go/container v1.22.1/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= --cloud.google.com/go/container v1.24.0/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= --cloud.google.com/go/container v1.26.0/go.mod h1:YJCmRet6+6jnYYRS000T6k0D0xUXQgBSaJ7VwI8FBj4= --cloud.google.com/go/container v1.26.1/go.mod h1:5smONjPRUxeEpDG7bMKWfDL4sauswqEtnBK1/KKpR04= --cloud.google.com/go/container v1.26.2/go.mod h1:YlO84xCt5xupVbLaMY4s3XNE79MUJ+49VmkInr6HvF4= --cloud.google.com/go/container v1.27.1/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= --cloud.google.com/go/container v1.28.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= --cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= --cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= --cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI= --cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s= --cloud.google.com/go/containeranalysis v0.10.1/go.mod h1:Ya2jiILITMY68ZLPaogjmOMNkwsDrWBSTyBubGXO7j0= --cloud.google.com/go/containeranalysis v0.11.0/go.mod h1:4n2e99ZwpGxpNcz+YsFT1dfOHPQFGcAC8FN2M2/ne/U= --cloud.google.com/go/containeranalysis v0.11.1/go.mod h1:rYlUOM7nem1OJMKwE1SadufX0JP3wnXj844EtZAwWLY= --cloud.google.com/go/containeranalysis v0.11.2/go.mod h1:xibioGBC1MD2j4reTyV1xY1/MvKaz+fyM9ENWhmIeP8= --cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U= --cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= --cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= --cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= --cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE= --cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM= --cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M= --cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0= --cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8= --cloud.google.com/go/datacatalog v1.14.0/go.mod h1:h0PrGtlihoutNMp/uvwhawLQ9+c63Kz65UFqh49Yo+E= --cloud.google.com/go/datacatalog v1.14.1/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= --cloud.google.com/go/datacatalog v1.16.0/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= --cloud.google.com/go/datacatalog v1.17.1/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= --cloud.google.com/go/datacatalog v1.18.0/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= --cloud.google.com/go/datacatalog v1.18.1/go.mod h1:TzAWaz+ON1tkNr4MOcak8EBHX7wIRX/gZKM+yTVsv+A= --cloud.google.com/go/datacatalog v1.18.2/go.mod h1:SPVgWW2WEMuWHA+fHodYjmxPiMqcOiWfhc9OD5msigk= --cloud.google.com/go/datacatalog v1.18.3/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= --cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= --cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= --cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= --cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= --cloud.google.com/go/dataflow v0.9.1/go.mod h1:Wp7s32QjYuQDWqJPFFlnBKhkAtiFpMTdg00qGbnIHVw= --cloud.google.com/go/dataflow v0.9.2/go.mod h1:vBfdBZ/ejlTaYIGB3zB4T08UshH70vbtZeMD+urnUSo= --cloud.google.com/go/dataflow v0.9.3/go.mod h1:HI4kMVjcHGTs3jTHW/kv3501YW+eloiJSLxkJa/vqFE= --cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w= --cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= --cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= --cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0= --cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA= --cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE= --cloud.google.com/go/dataform v0.8.1/go.mod h1:3BhPSiw8xmppbgzeBbmDvmSWlwouuJkXsXsb8UBih9M= --cloud.google.com/go/dataform v0.8.2/go.mod h1:X9RIqDs6NbGPLR80tnYoPNiO1w0wenKTb8PxxlhTMKM= --cloud.google.com/go/dataform v0.8.3/go.mod h1:8nI/tvv5Fso0drO3pEjtowz58lodx8MVkdV2q0aPlqg= --cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs= --cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38= --cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w= --cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= --cloud.google.com/go/datafusion v1.7.1/go.mod h1:KpoTBbFmoToDExJUso/fcCiguGDk7MEzOWXUsJo0wsI= --cloud.google.com/go/datafusion v1.7.2/go.mod h1:62K2NEC6DRlpNmI43WHMWf9Vg/YvN6QVi8EVwifElI0= --cloud.google.com/go/datafusion v1.7.3/go.mod h1:eoLt1uFXKGBq48jy9LZ+Is8EAVLnmn50lNncLzwYokE= --cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM= --cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= --cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= --cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= --cloud.google.com/go/datalabeling v0.8.1/go.mod h1:XS62LBSVPbYR54GfYQsPXZjTW8UxCK2fkDciSrpRFdY= --cloud.google.com/go/datalabeling v0.8.2/go.mod h1:cyDvGHuJWu9U/cLDA7d8sb9a0tWLEletStu2sTmg3BE= --cloud.google.com/go/datalabeling v0.8.3/go.mod h1:tvPhpGyS/V7lqjmb3V0TaDdGvhzgR1JoW7G2bpi2UTI= --cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8= --cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA= --cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A= --cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ= --cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs= --cloud.google.com/go/dataplex v1.8.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.9.0/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.9.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.10.1/go.mod h1:1MzmBv8FvjYfc7vDdxhnLFNskikkB+3vl475/XdCDhs= --cloud.google.com/go/dataplex v1.10.2/go.mod h1:xdC8URdTrCrZMW6keY779ZT1cTOfV8KEPNsw+LTRT1Y= --cloud.google.com/go/dataplex v1.11.1/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= --cloud.google.com/go/dataplex v1.11.2/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= --cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s= --cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI= --cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= --cloud.google.com/go/dataproc/v2 v2.0.1/go.mod h1:7Ez3KRHdFGcfY7GcevBbvozX+zyWGcwLJvvAMwCaoZ4= --cloud.google.com/go/dataproc/v2 v2.2.0/go.mod h1:lZR7AQtwZPvmINx5J87DSOOpTfof9LVZju6/Qo4lmcY= --cloud.google.com/go/dataproc/v2 v2.2.1/go.mod h1:QdAJLaBjh+l4PVlVZcmrmhGccosY/omC1qwfQ61Zv/o= --cloud.google.com/go/dataproc/v2 v2.2.2/go.mod h1:aocQywVmQVF4i8CL740rNI/ZRpsaaC1Wh2++BJ7HEJ4= --cloud.google.com/go/dataproc/v2 v2.2.3/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= --cloud.google.com/go/dataproc/v2 v2.3.0/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= --cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= --cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= --cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= --cloud.google.com/go/dataqna v0.8.1/go.mod h1:zxZM0Bl6liMePWsHA8RMGAfmTG34vJMapbHAxQ5+WA8= --cloud.google.com/go/dataqna v0.8.2/go.mod h1:KNEqgx8TTmUipnQsScOoDpq/VlXVptUqVMZnt30WAPs= --cloud.google.com/go/dataqna v0.8.3/go.mod h1:wXNBW2uvc9e7Gl5k8adyAMnLush1KVV6lZUhB+rqNu4= --cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c= --cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= --cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= --cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM= --cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c= --cloud.google.com/go/datastore v1.12.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.12.1/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.13.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.14.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= --cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= --cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= --cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= --cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g= --cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4= --cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs= --cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww= --cloud.google.com/go/datastream v1.9.1/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= --cloud.google.com/go/datastream v1.10.0/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= --cloud.google.com/go/datastream v1.10.1/go.mod h1:7ngSYwnw95YFyTd5tOGBxHlOZiL+OtpjheqU7t2/s/c= --cloud.google.com/go/datastream v1.10.2/go.mod h1:W42TFgKAs/om6x/CdXX5E4oiAsKlH+e8MTGy81zdYt0= --cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA= --cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c= --cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s= --cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI= --cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ= --cloud.google.com/go/deploy v1.11.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= --cloud.google.com/go/deploy v1.13.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= --cloud.google.com/go/deploy v1.13.1/go.mod h1:8jeadyLkH9qu9xgO3hVWw8jVr29N1mnW42gRJT8GY6g= --cloud.google.com/go/deploy v1.14.1/go.mod h1:N8S0b+aIHSEeSr5ORVoC0+/mOPUysVt8ae4QkZYolAw= --cloud.google.com/go/deploy v1.14.2/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= --cloud.google.com/go/deploy v1.15.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= --cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= --cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= --cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= --cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek= --cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0= --cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM= --cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4= --cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE= --cloud.google.com/go/dialogflow v1.38.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= --cloud.google.com/go/dialogflow v1.40.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= --cloud.google.com/go/dialogflow v1.43.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= --cloud.google.com/go/dialogflow v1.44.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= --cloud.google.com/go/dialogflow v1.44.1/go.mod h1:n/h+/N2ouKOO+rbe/ZnI186xImpqvCVj2DdsWS/0EAk= --cloud.google.com/go/dialogflow v1.44.2/go.mod h1:QzFYndeJhpVPElnFkUXxdlptx0wPnBWLCBT9BvtC3/c= --cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ= --cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= --cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= --cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= --cloud.google.com/go/dlp v1.10.1/go.mod h1:IM8BWz1iJd8njcNcG0+Kyd9OPnqnRNkDV8j42VT5KOI= --cloud.google.com/go/dlp v1.10.2/go.mod h1:ZbdKIhcnyhILgccwVDzkwqybthh7+MplGC3kZVZsIOQ= --cloud.google.com/go/dlp v1.10.3/go.mod h1:iUaTc/ln8I+QT6Ai5vmuwfw8fqTk2kaz0FvCwhLCom0= --cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI= --cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= --cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= --cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k= --cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4= --cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM= --cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs= --cloud.google.com/go/documentai v1.20.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= --cloud.google.com/go/documentai v1.22.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= --cloud.google.com/go/documentai v1.22.1/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= --cloud.google.com/go/documentai v1.23.0/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= --cloud.google.com/go/documentai v1.23.2/go.mod h1:Q/wcRT+qnuXOpjAkvOV4A+IeQl04q2/ReT7SSbytLSo= --cloud.google.com/go/documentai v1.23.4/go.mod h1:4MYAaEMnADPN1LPN5xboDR5QVB6AgsaxgFdJhitlE2Y= --cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g= --cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= --cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= --cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= --cloud.google.com/go/domains v0.9.1/go.mod h1:aOp1c0MbejQQ2Pjf1iJvnVyT+z6R6s8pX66KaCSDYfE= --cloud.google.com/go/domains v0.9.2/go.mod h1:3YvXGYzZG1Temjbk7EyGCuGGiXHJwVNmwIf+E/cUp5I= --cloud.google.com/go/domains v0.9.3/go.mod h1:29k66YNDLDY9LCFKpGFeh6Nj9r62ZKm5EsUJxAl84KU= --cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY= --cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= --cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= --cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc= --cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY= --cloud.google.com/go/edgecontainer v1.1.1/go.mod h1:O5bYcS//7MELQZs3+7mabRqoWQhXCzenBu0R8bz2rwk= --cloud.google.com/go/edgecontainer v1.1.2/go.mod h1:wQRjIzqxEs9e9wrtle4hQPSR1Y51kqN75dgF7UllZZ4= --cloud.google.com/go/edgecontainer v1.1.3/go.mod h1:Ll2DtIABzEfaxaVSbwj3QHFaOOovlDFiWVDu349jSsA= --cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE= --cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= --cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI= --cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8= --cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= --cloud.google.com/go/essentialcontacts v1.6.2/go.mod h1:T2tB6tX+TRak7i88Fb2N9Ok3PvY3UNbUsMag9/BARh4= --cloud.google.com/go/essentialcontacts v1.6.3/go.mod h1:yiPCD7f2TkP82oJEFXFTou8Jl8L6LBRPeBEkTaO0Ggo= --cloud.google.com/go/essentialcontacts v1.6.4/go.mod h1:iju5Vy3d9tJUg0PYMd1nHhjV7xoCXaOAVabrwLaPBEM= --cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM= --cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc= --cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw= --cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw= --cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= --cloud.google.com/go/eventarc v1.12.1/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= --cloud.google.com/go/eventarc v1.13.0/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= --cloud.google.com/go/eventarc v1.13.1/go.mod h1:EqBxmGHFrruIara4FUQ3RHlgfCn7yo1HYsu2Hpt/C3Y= --cloud.google.com/go/eventarc v1.13.2/go.mod h1:X9A80ShVu19fb4e5sc/OLV7mpFUKZMwfJFeeWhcIObM= --cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg= --cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= --cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= --cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs= --cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= --cloud.google.com/go/filestore v1.7.1/go.mod h1:y10jsorq40JJnjR/lQ8AfFbbcGlw3g+Dp8oN7i7FjV4= --cloud.google.com/go/filestore v1.7.2/go.mod h1:TYOlyJs25f/omgj+vY7/tIG/E7BX369triSPzE4LdgE= --cloud.google.com/go/filestore v1.7.3/go.mod h1:Qp8WaEERR3cSkxToxFPHh/b8AACkSut+4qlCjAmKTV0= --cloud.google.com/go/filestore v1.7.4/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= --cloud.google.com/go/filestore v1.8.0/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= --cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= --cloud.google.com/go/firestore v1.11.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= --cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= --cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= --cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ= --cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= --cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= --cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY= --cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08= --cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw= --cloud.google.com/go/functions v1.12.0/go.mod h1:AXWGrF3e2C/5ehvwYo/GH6O5s09tOPksiKhz+hH8WkA= --cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c= --cloud.google.com/go/functions v1.15.1/go.mod h1:P5yNWUTkyU+LvW/S9O6V+V423VZooALQlqoXdoPz5AE= --cloud.google.com/go/functions v1.15.2/go.mod h1:CHAjtcR6OU4XF2HuiVeriEdELNcnvRZSk1Q8RMqy4lE= --cloud.google.com/go/functions v1.15.3/go.mod h1:r/AMHwBheapkkySEhiZYLDBwVJCdlRwsm4ieJu35/Ug= --cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I= --cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= --cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= --cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w= --cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM= --cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0= --cloud.google.com/go/gaming v1.10.1/go.mod h1:XQQvtfP8Rb9Rxnxm5wFVpAp9zCQkJi2bLIb7iHGwB3s= --cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60= --cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo= --cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= --cloud.google.com/go/gkebackup v1.3.0/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= --cloud.google.com/go/gkebackup v1.3.1/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= --cloud.google.com/go/gkebackup v1.3.2/go.mod h1:OMZbXzEJloyXMC7gqdSB+EOEQ1AKcpGYvO3s1ec5ixk= --cloud.google.com/go/gkebackup v1.3.3/go.mod h1:eMk7/wVV5P22KBakhQnJxWSVftL1p4VBFLpv0kIft7I= --cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI= --cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= --cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= --cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= --cloud.google.com/go/gkeconnect v0.8.1/go.mod h1:KWiK1g9sDLZqhxB2xEuPV8V9NYzrqTUmQR9shJHpOZw= --cloud.google.com/go/gkeconnect v0.8.2/go.mod h1:6nAVhwchBJYgQCXD2pHBFQNiJNyAd/wyxljpaa6ZPrY= --cloud.google.com/go/gkeconnect v0.8.3/go.mod h1:i9GDTrfzBSUZGCe98qSu1B8YB8qfapT57PenIb820Jo= --cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw= --cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= --cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= --cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E= --cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw= --cloud.google.com/go/gkehub v0.14.1/go.mod h1:VEXKIJZ2avzrbd7u+zeMtW00Y8ddk/4V9511C9CQGTY= --cloud.google.com/go/gkehub v0.14.2/go.mod h1:iyjYH23XzAxSdhrbmfoQdePnlMj2EWcvnR+tHdBQsCY= --cloud.google.com/go/gkehub v0.14.3/go.mod h1:jAl6WafkHHW18qgq7kqcrXYzN08hXeK/Va3utN8VKg8= --cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc= --cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA= --cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI= --cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= --cloud.google.com/go/gkemulticloud v0.6.1/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= --cloud.google.com/go/gkemulticloud v1.0.0/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= --cloud.google.com/go/gkemulticloud v1.0.1/go.mod h1:AcrGoin6VLKT/fwZEYuqvVominLriQBCKmbjtnbMjG8= --cloud.google.com/go/gkemulticloud v1.0.2/go.mod h1:+ee5VXxKb3H1l4LZAcgWB/rvI16VTNTrInWxDjAGsGo= --cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0= --cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= --cloud.google.com/go/grafeas v0.3.0/go.mod h1:P7hgN24EyONOTMyeJH6DxG4zD7fwiYa5Q6GUgyFSOU8= --cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM= --cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o= --cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= --cloud.google.com/go/gsuiteaddons v1.6.1/go.mod h1:CodrdOqRZcLp5WOwejHWYBjZvfY0kOphkAKpF/3qdZY= --cloud.google.com/go/gsuiteaddons v1.6.2/go.mod h1:K65m9XSgs8hTF3X9nNTPi8IQueljSdYo9F+Mi+s4MyU= --cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tfXeCwTFRebTq48= --cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE= --cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= --cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= --cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= --cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= --cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= --cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= --cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY= --cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= --cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= --cloud.google.com/go/iam v1.0.1/go.mod h1:yR3tmSL8BcZB4bxByRv2jkSIahVmCtfKZwLYGBalRE8= --cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= --cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= --cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= --cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= --cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= --cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= --cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= --cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= --cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= --cloud.google.com/go/iap v1.7.0/go.mod h1:beqQx56T9O1G1yNPph+spKpNibDlYIiIixiqsQXxLIo= --cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74= --cloud.google.com/go/iap v1.8.1/go.mod h1:sJCbeqg3mvWLqjZNsI6dfAtbbV1DL2Rl7e1mTyXYREQ= --cloud.google.com/go/iap v1.9.0/go.mod h1:01OFxd1R+NFrg78S+hoPV5PxEzv22HXaNqUUlmNHFuY= --cloud.google.com/go/iap v1.9.1/go.mod h1:SIAkY7cGMLohLSdBR25BuIxO+I4fXJiL06IBL7cy/5Q= --cloud.google.com/go/iap v1.9.2/go.mod h1:GwDTOs047PPSnwRD0Us5FKf4WDRcVvHg1q9WVkKBhdI= --cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw= --cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= --cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY= --cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= --cloud.google.com/go/ids v1.4.1/go.mod h1:np41ed8YMU8zOgv53MMMoCntLTn2lF+SUzlM+O3u/jw= --cloud.google.com/go/ids v1.4.2/go.mod h1:3vw8DX6YddRu9BncxuzMyWn0g8+ooUjI2gslJ7FH3vk= --cloud.google.com/go/ids v1.4.3/go.mod h1:9CXPqI3GedjmkjbMWCUhMZ2P2N7TUMzAkVXYEH2orYU= --cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI= --cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= --cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g= --cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o= --cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE= --cloud.google.com/go/iot v1.7.1/go.mod h1:46Mgw7ev1k9KqK1ao0ayW9h0lI+3hxeanz+L1zmbbbk= --cloud.google.com/go/iot v1.7.2/go.mod h1:q+0P5zr1wRFpw7/MOgDXrG/HVA+l+cSwdObffkrpnSg= --cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I= --cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk= --cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= --cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= --cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= --cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg= --cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w= --cloud.google.com/go/kms v1.10.0/go.mod h1:ng3KTUtQQU9bPX3+QGLsflZIHlkbn8amFAMY63m8d24= --cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= --cloud.google.com/go/kms v1.11.0/go.mod h1:hwdiYC0xjnWsKQQCQQmIQnS9asjYVSK6jtXm+zFqXLM= --cloud.google.com/go/kms v1.12.1/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= --cloud.google.com/go/kms v1.15.0/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= --cloud.google.com/go/kms v1.15.2/go.mod h1:3hopT4+7ooWRCjc2DxgnpESFxhIraaI2IpAVUEhbT/w= --cloud.google.com/go/kms v1.15.3/go.mod h1:AJdXqHxS2GlPyduM99s9iGqi2nwbviBbhV/hdmt4iOQ= --cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc= --cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= --cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= --cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= --cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= --cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8= --cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= --cloud.google.com/go/language v1.10.1/go.mod h1:CPp94nsdVNiQEt1CNjF5WkTcisLiHPyIbMhvR8H2AW0= --cloud.google.com/go/language v1.11.0/go.mod h1:uDx+pFDdAKTY8ehpWbiXyQdz8tDSYLJbQcXsCkjYyvQ= --cloud.google.com/go/language v1.11.1/go.mod h1:Xyid9MG9WOX3utvDbpX7j3tXDmmDooMyMDqgUVpH17U= --cloud.google.com/go/language v1.12.1/go.mod h1:zQhalE2QlQIxbKIZt54IASBzmZpN/aDASea5zl1l+J4= --cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc= --cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= --cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= --cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= --cloud.google.com/go/lifesciences v0.9.1/go.mod h1:hACAOd1fFbCGLr/+weUKRAJas82Y4vrL3O5326N//Wc= --cloud.google.com/go/lifesciences v0.9.2/go.mod h1:QHEOO4tDzcSAzeJg7s2qwnLM2ji8IRpQl4p6m5Z9yTA= --cloud.google.com/go/lifesciences v0.9.3/go.mod h1:gNGBOJV80IWZdkd+xz4GQj4mbqaz737SCLHn2aRhQKM= --cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA= --cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw= --cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= --cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= --cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= --cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= --cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= --cloud.google.com/go/longrunning v0.4.2/go.mod h1:OHrnaYyLUV6oqwh0xiS7e5sLQhP1m0QU9R+WhGDMgIQ= --cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= --cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= --cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs= --cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y= --cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= --cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= --cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= --cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= --cloud.google.com/go/managedidentities v1.6.1/go.mod h1:h/irGhTN2SkZ64F43tfGPMbHnypMbu4RB3yl8YcuEak= --cloud.google.com/go/managedidentities v1.6.2/go.mod h1:5c2VG66eCa0WIq6IylRk3TBW83l161zkFvCj28X7jn8= --cloud.google.com/go/managedidentities v1.6.3/go.mod h1:tewiat9WLyFN0Fi7q1fDD5+0N4VUoL0SCX0OTCthZq4= --cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM= --cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI= --cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw= --cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY= --cloud.google.com/go/maps v1.3.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= --cloud.google.com/go/maps v1.4.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= --cloud.google.com/go/maps v1.4.1/go.mod h1:BxSa0BnW1g2U2gNdbq5zikLlHUuHW0GFWh7sgML2kIY= --cloud.google.com/go/maps v1.5.1/go.mod h1:NPMZw1LJwQZYCfz4y+EIw+SI+24A4bpdFJqdKVr0lt4= --cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18= --cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= --cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= --cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= --cloud.google.com/go/mediatranslation v0.8.1/go.mod h1:L/7hBdEYbYHQJhX2sldtTO5SZZ1C1vkapubj0T2aGig= --cloud.google.com/go/mediatranslation v0.8.2/go.mod h1:c9pUaDRLkgHRx3irYE5ZC8tfXGrMYwNZdmDqKMSfFp8= --cloud.google.com/go/mediatranslation v0.8.3/go.mod h1:F9OnXTy336rteOEywtY7FOqCk+J43o2RF638hkOQl4Y= --cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4= --cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= --cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= --cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA= --cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY= --cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= --cloud.google.com/go/memcache v1.10.1/go.mod h1:47YRQIarv4I3QS5+hoETgKO40InqzLP6kpNLvyXuyaA= --cloud.google.com/go/memcache v1.10.2/go.mod h1:f9ZzJHLBrmd4BkguIAa/l/Vle6uTHzHokdnzSWOdQ6A= --cloud.google.com/go/memcache v1.10.3/go.mod h1:6z89A41MT2DVAW0P4iIRdu5cmRTsbsFn4cyiIx8gbwo= --cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0= --cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= --cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= --cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8= --cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI= --cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= --cloud.google.com/go/metastore v1.11.1/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= --cloud.google.com/go/metastore v1.12.0/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= --cloud.google.com/go/metastore v1.13.0/go.mod h1:URDhpG6XLeh5K+Glq0NOt74OfrPKTwS62gEPZzb5SOk= --cloud.google.com/go/metastore v1.13.1/go.mod h1:IbF62JLxuZmhItCppcIfzBBfUFq0DIB9HPDoLgWrVOU= --cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA= --cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE= --cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= --cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= --cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= --cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= --cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM= --cloud.google.com/go/monitoring v1.16.0/go.mod h1:Ptp15HgAyM1fNICAojDMoNc/wUmn67mLHQfyqbw+poY= --cloud.google.com/go/monitoring v1.16.1/go.mod h1:6HsxddR+3y9j+o/cMJH6q/KJ/CBTvM/38L/1m7bTRJ4= --cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc= --cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= --cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= --cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= --cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= --cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8= --cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E= --cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM= --cloud.google.com/go/networkconnectivity v1.12.1/go.mod h1:PelxSWYM7Sh9/guf8CFhi6vIqf19Ir/sbfZRUwXh92E= --cloud.google.com/go/networkconnectivity v1.13.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= --cloud.google.com/go/networkconnectivity v1.14.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= --cloud.google.com/go/networkconnectivity v1.14.1/go.mod h1:LyGPXR742uQcDxZ/wv4EI0Vu5N6NKJ77ZYVnDe69Zug= --cloud.google.com/go/networkconnectivity v1.14.2/go.mod h1:5UFlwIisZylSkGG1AdwK/WZUaoz12PKu6wODwIbFzJo= --cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek= --cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8= --cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4= --cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= --cloud.google.com/go/networkmanagement v1.8.0/go.mod h1:Ho/BUGmtyEqrttTgWEe7m+8vDdK74ibQc+Be0q7Fof0= --cloud.google.com/go/networkmanagement v1.9.0/go.mod h1:UTUaEU9YwbCAhhz3jEOHr+2/K/MrBk2XxOLS89LQzFw= --cloud.google.com/go/networkmanagement v1.9.1/go.mod h1:CCSYgrQQvW73EJawO2QamemYcOb57LvrDdDU51F0mcI= --cloud.google.com/go/networkmanagement v1.9.2/go.mod h1:iDGvGzAoYRghhp4j2Cji7sF899GnfGQcQRQwgVOWnDw= --cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU= --cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= --cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= --cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k= --cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU= --cloud.google.com/go/networksecurity v0.9.1/go.mod h1:MCMdxOKQ30wsBI1eI659f9kEp4wuuAueoC9AJKSPWZQ= --cloud.google.com/go/networksecurity v0.9.2/go.mod h1:jG0SeAttWzPMUILEHDUvFYdQTl8L/E/KC8iZDj85lEI= --cloud.google.com/go/networksecurity v0.9.3/go.mod h1:l+C0ynM6P+KV9YjOnx+kk5IZqMSLccdBqW6GUoF4p/0= --cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w= --cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= --cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= --cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA= --cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0= --cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE= --cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ= --cloud.google.com/go/notebooks v1.9.1/go.mod h1:zqG9/gk05JrzgBt4ghLzEepPHNwE5jgPcHZRKhlC1A8= --cloud.google.com/go/notebooks v1.10.0/go.mod h1:SOPYMZnttHxqot0SGSFSkRrwE29eqnKPBJFqgWmiK2k= --cloud.google.com/go/notebooks v1.10.1/go.mod h1:5PdJc2SgAybE76kFQCWrTfJolCOUQXF97e+gteUUA6A= --cloud.google.com/go/notebooks v1.11.1/go.mod h1:V2Zkv8wX9kDCGRJqYoI+bQAaoVeE5kSiz4yYHd2yJwQ= --cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70= --cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4= --cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs= --cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= --cloud.google.com/go/optimization v1.4.1/go.mod h1:j64vZQP7h9bO49m2rVaTVoNM0vEBEN5eKPUPbZyXOrk= --cloud.google.com/go/optimization v1.5.0/go.mod h1:evo1OvTxeBRBu6ydPlrIRizKY/LJKo/drDMMRKqGEUU= --cloud.google.com/go/optimization v1.5.1/go.mod h1:NC0gnUD5MWVAF7XLdoYVPmYYVth93Q6BUzqAq3ZwtV8= --cloud.google.com/go/optimization v1.6.1/go.mod h1:hH2RYPTTM9e9zOiTaYPTiGPcGdNZVnBSBxjIAJzUkqo= --cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY= --cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA= --cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk= --cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= --cloud.google.com/go/orchestration v1.8.1/go.mod h1:4sluRF3wgbYVRqz7zJ1/EUNc90TTprliq9477fGobD8= --cloud.google.com/go/orchestration v1.8.2/go.mod h1:T1cP+6WyTmh6LSZzeUhvGf0uZVmJyTx7t8z7Vg87+A0= --cloud.google.com/go/orchestration v1.8.3/go.mod h1:xhgWAYqlbYjlz2ftbFghdyqENYW+JXuhBx9KsjMoGHs= --cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI= --cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE= --cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc= --cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= --cloud.google.com/go/orgpolicy v1.11.0/go.mod h1:2RK748+FtVvnfuynxBzdnyu7sygtoZa1za/0ZfpOs1M= --cloud.google.com/go/orgpolicy v1.11.1/go.mod h1:8+E3jQcpZJQliP+zaFfayC2Pg5bmhuLK755wKhIIUCE= --cloud.google.com/go/orgpolicy v1.11.2/go.mod h1:biRDpNwfyytYnmCRWZWxrKF22Nkz9eNVj9zyaBdpm1o= --cloud.google.com/go/orgpolicy v1.11.3/go.mod h1:oKAtJ/gkMjum5icv2aujkP4CxROxPXsBbYGCDbPO8MM= --cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI= --cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= --cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= --cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo= --cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw= --cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= --cloud.google.com/go/osconfig v1.12.0/go.mod h1:8f/PaYzoS3JMVfdfTubkowZYGmAhUCjjwnjqWI7NVBc= --cloud.google.com/go/osconfig v1.12.1/go.mod h1:4CjBxND0gswz2gfYRCUoUzCm9zCABp91EeTtWXyz0tE= --cloud.google.com/go/osconfig v1.12.2/go.mod h1:eh9GPaMZpI6mEJEuhEjUJmaxvQ3gav+fFEJon1Y8Iw0= --cloud.google.com/go/osconfig v1.12.3/go.mod h1:L/fPS8LL6bEYUi1au832WtMnPeQNT94Zo3FwwV1/xGM= --cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA= --cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= --cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= --cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70= --cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo= --cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= --cloud.google.com/go/oslogin v1.10.1/go.mod h1:x692z7yAue5nE7CsSnoG0aaMbNoRJRXO4sn73R+ZqAs= --cloud.google.com/go/oslogin v1.11.0/go.mod h1:8GMTJs4X2nOAUVJiPGqIWVcDaF0eniEto3xlOxaboXE= --cloud.google.com/go/oslogin v1.11.1/go.mod h1:OhD2icArCVNUxKqtK0mcSmKL7lgr0LVlQz+v9s1ujTg= --cloud.google.com/go/oslogin v1.12.1/go.mod h1:VfwTeFJGbnakxAY236eN8fsnglLiVXndlbcNomY4iZU= --cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY= --cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= --cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= --cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= --cloud.google.com/go/phishingprotection v0.8.1/go.mod h1:AxonW7GovcA8qdEk13NfHq9hNx5KPtfxXNeUxTDxB6I= --cloud.google.com/go/phishingprotection v0.8.2/go.mod h1:LhJ91uyVHEYKSKcMGhOa14zMMWfbEdxG032oT6ECbC8= --cloud.google.com/go/phishingprotection v0.8.3/go.mod h1:3B01yO7T2Ra/TMojifn8EoGd4G9jts/6cIO0DgDY9J8= --cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE= --cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg= --cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE= --cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw= --cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc= --cloud.google.com/go/policytroubleshooter v1.7.1/go.mod h1:0NaT5v3Ag1M7U5r0GfDCpUFkWd9YqpubBWsQlhanRv0= --cloud.google.com/go/policytroubleshooter v1.8.0/go.mod h1:tmn5Ir5EToWe384EuboTcVQT7nTag2+DuH3uHmKd1HU= --cloud.google.com/go/policytroubleshooter v1.9.0/go.mod h1:+E2Lga7TycpeSTj2FsH4oXxTnrbHJGRlKhVZBLGgU64= --cloud.google.com/go/policytroubleshooter v1.9.1/go.mod h1:MYI8i0bCrL8cW+VHN1PoiBTyNZTstCg2WUw2eVC4c4U= --cloud.google.com/go/policytroubleshooter v1.10.1/go.mod h1:5C0rhT3TDZVxAu8813bwmTvd57Phbl8mr9F4ipOsxEs= --cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0= --cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= --cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= --cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg= --cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs= --cloud.google.com/go/privatecatalog v0.9.1/go.mod h1:0XlDXW2unJXdf9zFz968Hp35gl/bhF4twwpXZAW50JA= --cloud.google.com/go/privatecatalog v0.9.2/go.mod h1:RMA4ATa8IXfzvjrhhK8J6H4wwcztab+oZph3c6WmtFc= --cloud.google.com/go/privatecatalog v0.9.3/go.mod h1:K5pn2GrVmOPjXz3T26mzwXLcKivfIJ9R5N79AFCF9UE= --cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0= --cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= --cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= --cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= --cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= --cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI= --cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0= --cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8= --cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= --cloud.google.com/go/pubsub v1.32.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= --cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= --cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg= --cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k= --cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM= --cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0= --cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= --cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= --cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= --cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= --cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE= --cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U= --cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA= --cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c= --cloud.google.com/go/recaptchaenterprise/v2 v2.7.2/go.mod h1:kR0KjsJS7Jt1YSyWFkseQ756D45kaYNTlDPPaRAvDBU= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.0/go.mod h1:QuE8EdU9dEnesG8/kG3XuJyNsjEqMlMzg3v3scCJ46c= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.1/go.mod h1:JZYZJOeZjgSSTGP4uz7NlQ4/d1w5hGmksVgM0lbEij0= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.2/go.mod h1:kpaDBOpkwD4G0GVMzG1W6Doy1tFFC97XAV3xy+Rd/pw= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.3/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.4/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= --cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= --cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= --cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= --cloud.google.com/go/recommendationengine v0.8.1/go.mod h1:MrZihWwtFYWDzE6Hz5nKcNz3gLizXVIDI/o3G1DLcrE= --cloud.google.com/go/recommendationengine v0.8.2/go.mod h1:QIybYHPK58qir9CV2ix/re/M//Ty10OxjnnhWdaKS1Y= --cloud.google.com/go/recommendationengine v0.8.3/go.mod h1:m3b0RZV02BnODE9FeSvGv1qibFo8g0OnmB/RMwYy4V8= --cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU= --cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= --cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= --cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs= --cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70= --cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= --cloud.google.com/go/recommender v1.10.1/go.mod h1:XFvrE4Suqn5Cq0Lf+mCP6oBHD/yRMA8XxP5sb7Q7gpA= --cloud.google.com/go/recommender v1.11.0/go.mod h1:kPiRQhPyTJ9kyXPCG6u/dlPLbYfFlkwHNRwdzPVAoII= --cloud.google.com/go/recommender v1.11.1/go.mod h1:sGwFFAyI57v2Hc5LbIj+lTwXipGu9NW015rkaEM5B18= --cloud.google.com/go/recommender v1.11.2/go.mod h1:AeoJuzOvFR/emIcXdVFkspVXVTYpliRCmKNYDnyBv6Y= --cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4= --cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= --cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= --cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA= --cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM= --cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= --cloud.google.com/go/redis v1.13.1/go.mod h1:VP7DGLpE91M6bcsDdMuyCm2hIpB6Vp2hI090Mfd1tcg= --cloud.google.com/go/redis v1.13.2/go.mod h1:0Hg7pCMXS9uz02q+LoEVl5dNHUkIQv+C/3L76fandSA= --cloud.google.com/go/redis v1.13.3/go.mod h1:vbUpCKUAZSYzFcWKmICnYgRAhTFg9r+djWqFxDYXi4U= --cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs= --cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA= --cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0= --cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots= --cloud.google.com/go/resourcemanager v1.6.0/go.mod h1:YcpXGRs8fDzcUl1Xw8uOVmI8JEadvhRIkoXXUNVYcVo= --cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI= --cloud.google.com/go/resourcemanager v1.9.1/go.mod h1:dVCuosgrh1tINZ/RwBufr8lULmWGOkPS8gL5gqyjdT8= --cloud.google.com/go/resourcemanager v1.9.2/go.mod h1:OujkBg1UZg5lX2yIyMo5Vz9O5hf7XQOSV7WxqxxMtQE= --cloud.google.com/go/resourcemanager v1.9.3/go.mod h1:IqrY+g0ZgLsihcfcmqSe+RKp1hzjXwG904B92AwBz6U= --cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0= --cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU= --cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg= --cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= --cloud.google.com/go/resourcesettings v1.6.1/go.mod h1:M7mk9PIZrC5Fgsu1kZJci6mpgN8o0IUzVx3eJU3y4Jw= --cloud.google.com/go/resourcesettings v1.6.2/go.mod h1:mJIEDd9MobzunWMeniaMp6tzg4I2GvD3TTmPkc8vBXk= --cloud.google.com/go/resourcesettings v1.6.3/go.mod h1:pno5D+7oDYkMWZ5BpPsb4SO0ewg3IXcmmrUZaMJrFic= --cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI= --cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= --cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= --cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc= --cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y= --cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= --cloud.google.com/go/retail v1.14.1/go.mod h1:y3Wv3Vr2k54dLNIrCzenyKG8g8dhvhncT2NcNjb/6gE= --cloud.google.com/go/retail v1.14.2/go.mod h1:W7rrNRChAEChX336QF7bnMxbsjugcOCPU44i5kbLiL8= --cloud.google.com/go/retail v1.14.3/go.mod h1:Omz2akDHeSlfCq8ArPKiBxlnRpKEBjUH386JYFLUvXo= --cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg= --cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do= --cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo= --cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM= --cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg= --cloud.google.com/go/run v1.2.0/go.mod h1:36V1IlDzQ0XxbQjUx6IYbw8H3TJnWvhii963WW3B/bo= --cloud.google.com/go/run v1.3.0/go.mod h1:S/osX/4jIPZGg+ssuqh6GNgg7syixKe3YnprwehzHKU= --cloud.google.com/go/run v1.3.1/go.mod h1:cymddtZOzdwLIAsmS6s+Asl4JoXIDm/K1cpZTxV4Q5s= --cloud.google.com/go/run v1.3.2/go.mod h1:SIhmqArbjdU/D9M6JoHaAqnAMKLFtXaVdNeq04NjnVE= --cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4= --cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= --cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= --cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk= --cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44= --cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc= --cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc= --cloud.google.com/go/scheduler v1.10.1/go.mod h1:R63Ldltd47Bs4gnhQkmNDse5w8gBRrhObZ54PxgR2Oo= --cloud.google.com/go/scheduler v1.10.2/go.mod h1:O3jX6HRH5eKCA3FutMw375XHZJudNIKVonSCHv7ropY= --cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8WVLy7/yGvbc= --cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= --cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= --cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= --cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= --cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= --cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= --cloud.google.com/go/secretmanager v1.11.1/go.mod h1:znq9JlXgTNdBeQk9TBW/FnR/W4uChEKGeqQWAJ8SXFw= --cloud.google.com/go/secretmanager v1.11.2/go.mod h1:MQm4t3deoSub7+WNwiC4/tRYgDBHJgJPvswqQVB1Vss= --cloud.google.com/go/secretmanager v1.11.3/go.mod h1:0bA2o6FabmShrEy328i67aV+65XoUFFSmVeLBn/51jI= --cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= --cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= --cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= --cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= --cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q= --cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA= --cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8= --cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0= --cloud.google.com/go/security v1.15.1/go.mod h1:MvTnnbsWnehoizHi09zoiZob0iCHVcL4AUBj76h9fXA= --cloud.google.com/go/security v1.15.2/go.mod h1:2GVE/v1oixIRHDaClVbHuPcZwAqFM28mXuAKCfMgYIg= --cloud.google.com/go/security v1.15.3/go.mod h1:gQ/7Q2JYUZZgOzqKtw9McShH+MjNvtDpL40J1cT+vBs= --cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4= --cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= --cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= --cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk= --cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk= --cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0= --cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag= --cloud.google.com/go/securitycenter v1.23.0/go.mod h1:8pwQ4n+Y9WCWM278R8W3nF65QtY172h4S8aXyI9/hsQ= --cloud.google.com/go/securitycenter v1.23.1/go.mod h1:w2HV3Mv/yKhbXKwOCu2i8bCuLtNP1IMHuiYQn4HJq5s= --cloud.google.com/go/securitycenter v1.24.1/go.mod h1:3h9IdjjHhVMXdQnmqzVnM7b0wMn/1O/U20eWVpMpZjI= --cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM= --cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU= --cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s= --cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA= --cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc= --cloud.google.com/go/servicecontrol v1.11.1/go.mod h1:aSnNNlwEFBY+PWGQ2DoM0JJ/QUXqV5/ZD9DOLB7SnUk= --cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= --cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= --cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4= --cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U= --cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY= --cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= --cloud.google.com/go/servicedirectory v1.10.1/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= --cloud.google.com/go/servicedirectory v1.11.0/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= --cloud.google.com/go/servicedirectory v1.11.1/go.mod h1:tJywXimEWzNzw9FvtNjsQxxJ3/41jseeILgwU/QLrGI= --cloud.google.com/go/servicedirectory v1.11.2/go.mod h1:KD9hCLhncWRV5jJphwIpugKwM5bn1x0GyVVD4NO8mGg= --cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw= --cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco= --cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo= --cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc= --cloud.google.com/go/servicemanagement v1.8.0/go.mod h1:MSS2TDlIEQD/fzsSGfCdJItQveu9NXnUniTrq/L8LK4= --cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E= --cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU= --cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec= --cloud.google.com/go/serviceusage v1.6.0/go.mod h1:R5wwQcbOWsyuOfbP9tGdAnCAc6B9DRwPG1xtWMDeuPA= --cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4= --cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw= --cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= --cloud.google.com/go/shell v1.7.1/go.mod h1:u1RaM+huXFaTojTbW4g9P5emOrrmLE69KrxqQahKn4g= --cloud.google.com/go/shell v1.7.2/go.mod h1:KqRPKwBV0UyLickMn0+BY1qIyE98kKyI216sH/TuHmc= --cloud.google.com/go/shell v1.7.3/go.mod h1:cTTEz/JdaBsQAeTQ3B6HHldZudFoYBOqjteev07FbIc= --cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM= --cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= --cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= --cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= --cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= --cloud.google.com/go/spanner v1.49.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= --cloud.google.com/go/spanner v1.50.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= --cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0= --cloud.google.com/go/spanner v1.53.0/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws= --cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= --cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= --cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= --cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco= --cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0= --cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI= --cloud.google.com/go/speech v1.17.1/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= --cloud.google.com/go/speech v1.19.0/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= --cloud.google.com/go/speech v1.19.1/go.mod h1:WcuaWz/3hOlzPFOVo9DUsblMIHwxP589y6ZMtaG+iAA= --cloud.google.com/go/speech v1.19.2/go.mod h1:2OYFfj+Ch5LWjsaSINuCZsre/789zlcCI3SY4oAi2oI= --cloud.google.com/go/speech v1.20.1/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= --cloud.google.com/go/speech v1.21.0/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= --cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= --cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= --cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= --cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= --cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= --cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= --cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= --cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= --cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= --cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= --cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= --cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= --cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= --cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= --cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= --cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= --cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw= --cloud.google.com/go/storagetransfer v1.10.0/go.mod h1:DM4sTlSmGiNczmV6iZyceIh2dbs+7z2Ayg6YAiQlYfA= --cloud.google.com/go/storagetransfer v1.10.1/go.mod h1:rS7Sy0BtPviWYTTJVWCSV4QrbBitgPeuK4/FKa4IdLs= --cloud.google.com/go/storagetransfer v1.10.2/go.mod h1:meIhYQup5rg9juQJdyppnA/WLQCOguxtk1pr3/vBWzA= --cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc= --cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= --cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= --cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM= --cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA= --cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= --cloud.google.com/go/talent v1.6.2/go.mod h1:CbGvmKCG61mkdjcqTcLOkb2ZN1SrQI8MDyma2l7VD24= --cloud.google.com/go/talent v1.6.3/go.mod h1:xoDO97Qd4AK43rGjJvyBHMskiEf3KulgYzcH6YWOVoo= --cloud.google.com/go/talent v1.6.4/go.mod h1:QsWvi5eKeh6gG2DlBkpMaFYZYrYUnIpo34f6/V5QykY= --cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI= --cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8= --cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4= --cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= --cloud.google.com/go/texttospeech v1.7.1/go.mod h1:m7QfG5IXxeneGqTapXNxv2ItxP/FS0hCZBwXYqucgSk= --cloud.google.com/go/texttospeech v1.7.2/go.mod h1:VYPT6aTOEl3herQjFHYErTlSZJ4vB00Q2ZTmuVgluD4= --cloud.google.com/go/texttospeech v1.7.3/go.mod h1:Av/zpkcgWfXlDLRYob17lqMstGZ3GqlvJXqKMp2u8so= --cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74= --cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ= --cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg= --cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= --cloud.google.com/go/tpu v1.6.1/go.mod h1:sOdcHVIgDEEOKuqUoi6Fq53MKHJAtOwtz0GuKsWSH3E= --cloud.google.com/go/tpu v1.6.2/go.mod h1:NXh3NDwt71TsPZdtGWgAG5ThDfGd32X1mJ2cMaRlVgU= --cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY= --cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y= --cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= --cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= --cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= --cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= --cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= --cloud.google.com/go/trace v1.10.2/go.mod h1:NPXemMi6MToRFcSxRl2uDnu/qAlAQ3oULUphcHGh1vA= --cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY= --cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY= --cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= --cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= --cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0= --cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= --cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= --cloud.google.com/go/translate v1.8.1/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.8.2/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.9.0/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.9.1/go.mod h1:TWIgDZknq2+JD4iRcojgeDtqGEp154HN/uL6hMvylS8= --cloud.google.com/go/translate v1.9.2/go.mod h1:E3Tc6rUTsQkVrXW6avbUhKJSr7ZE3j7zNmqzXKHqRrY= --cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0= --cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk= --cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw= --cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg= --cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk= --cloud.google.com/go/video v1.14.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= --cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= --cloud.google.com/go/video v1.17.1/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= --cloud.google.com/go/video v1.19.0/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= --cloud.google.com/go/video v1.20.0/go.mod h1:U3G3FTnsvAGqglq9LxgqzOiBc/Nt8zis8S+850N2DUM= --cloud.google.com/go/video v1.20.1/go.mod h1:3gJS+iDprnj8SY6pe0SwLeC5BUW80NjhwX7INWEuWGU= --cloud.google.com/go/video v1.20.2/go.mod h1:lrixr5JeKNThsgfM9gqtwb6Okuqzfo4VrY2xynaViTA= --cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU= --cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= --cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= --cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M= --cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU= --cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= --cloud.google.com/go/videointelligence v1.11.1/go.mod h1:76xn/8InyQHarjTWsBR058SmlPCwQjgcvoW0aZykOvo= --cloud.google.com/go/videointelligence v1.11.2/go.mod h1:ocfIGYtIVmIcWk1DsSGOoDiXca4vaZQII1C85qtoplc= --cloud.google.com/go/videointelligence v1.11.3/go.mod h1:tf0NUaGTjU1iS2KEkGWvO5hRHeCkFK3nPo0/cOZhZAo= --cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8= --cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= --cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= --cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= --cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY= --cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E= --cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY= --cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0= --cloud.google.com/go/vision/v2 v2.7.2/go.mod h1:jKa8oSYBWhYiXarHPvP4USxYANYUEdEsQrloLjrSwJU= --cloud.google.com/go/vision/v2 v2.7.3/go.mod h1:V0IcLCY7W+hpMKXK1JYE0LV5llEqVmj+UJChjvA1WsM= --cloud.google.com/go/vision/v2 v2.7.4/go.mod h1:ynDKnsDN/0RtqkKxQZ2iatv3Dm9O+HfRb5djl7l4Vvw= --cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM= --cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE= --cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g= --cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc= --cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY= --cloud.google.com/go/vmmigration v1.7.1/go.mod h1:WD+5z7a/IpZ5bKK//YmT9E047AD+rjycCAvyMxGJbro= --cloud.google.com/go/vmmigration v1.7.2/go.mod h1:iA2hVj22sm2LLYXGPT1pB63mXHhrH1m/ruux9TwWLd8= --cloud.google.com/go/vmmigration v1.7.3/go.mod h1:ZCQC7cENwmSWlwyTrZcWivchn78YnFniEQYRWQ65tBo= --cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70= --cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208= --cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8= --cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY= --cloud.google.com/go/vmwareengine v0.4.1/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= --cloud.google.com/go/vmwareengine v1.0.0/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= --cloud.google.com/go/vmwareengine v1.0.1/go.mod h1:aT3Xsm5sNx0QShk1Jc1B8OddrxAScYLwzVoaiXfdzzk= --cloud.google.com/go/vmwareengine v1.0.2/go.mod h1:xMSNjIk8/itYrz1JA8nV3Ajg4L4n3N+ugP8JKzk3OaA= --cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4= --cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w= --cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8= --cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= --cloud.google.com/go/vpcaccess v1.7.1/go.mod h1:FogoD46/ZU+JUBX9D606X21EnxiszYi2tArQwLY4SXs= --cloud.google.com/go/vpcaccess v1.7.2/go.mod h1:mmg/MnRHv+3e8FJUjeSibVFvQF1cCy2MsFaFqxeY1HU= --cloud.google.com/go/vpcaccess v1.7.3/go.mod h1:YX4skyfW3NC8vI3Fk+EegJnlYFatA+dXK4o236EUCUc= --cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk= --cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= --cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= --cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc= --cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A= --cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= --cloud.google.com/go/webrisk v1.9.1/go.mod h1:4GCmXKcOa2BZcZPn6DCEvE7HypmEJcJkr4mtM+sqYPc= --cloud.google.com/go/webrisk v1.9.2/go.mod h1:pY9kfDgAqxUpDBOrG4w8deLfhvJmejKB0qd/5uQIPBc= --cloud.google.com/go/webrisk v1.9.3/go.mod h1:RUYXe9X/wBDXhVilss7EDLW9ZNa06aowPuinUOPCXH8= --cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0= --cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo= --cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ= --cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= --cloud.google.com/go/websecurityscanner v1.6.1/go.mod h1:Njgaw3rttgRHXzwCB8kgCYqv5/rGpFCsBOvPbYgszpg= --cloud.google.com/go/websecurityscanner v1.6.2/go.mod h1:7YgjuU5tun7Eg2kpKgGnDuEOXWIrh8x8lWrJT4zfmas= --cloud.google.com/go/websecurityscanner v1.6.3/go.mod h1:x9XANObUFR+83Cya3g/B9M/yoHVqzxPnFtgF8yYGAXw= --cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o= --cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= --cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= --cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= --cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= --cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= --cloud.google.com/go/workflows v1.11.1/go.mod h1:Z+t10G1wF7h8LgdY/EmRcQY8ptBD/nvofaL6FqlET6g= --cloud.google.com/go/workflows v1.12.0/go.mod h1:PYhSk2b6DhZ508tj8HXKaBh+OFe+xdl0dHF/tJdzPQM= --cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCwLM1P1tBRGHM= --cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc= --cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g= --dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= --gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= --git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= --github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= --github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= - github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= - github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= --github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= --github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= --github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= - github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= - github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= - github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -@@ -1163,310 +7,54 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 - github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= - github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= - github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= --github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= - github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= - github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= - github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= - github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= --github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= --github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= --github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= --github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= --github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= --github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= --github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= --github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= --github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= --github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= --github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= --github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= --github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= - github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= --github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= - github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= --github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= - github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= - github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= --github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= --github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= --github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= --github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= --github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= --github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= --github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= --github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= --github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= --github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= --github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= --github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= - github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= - github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= --github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= --github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= --github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= --github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= --github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= --github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= --github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= --github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= --github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= --github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= --github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= --github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= --github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= --github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= --github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= --github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= --github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= --github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= --github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= --github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= --github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= --github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= --github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= --github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= --github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= --github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= --github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= --github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= --github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= --github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= --github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= --github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= --github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q= --github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= --github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= --github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= --github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= --github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= --github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= --github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= --github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= --github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= - github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= --github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= - github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= - github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= --github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= --github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= - github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= - github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= - github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= - github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= --github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= --github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= --github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= --github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= --github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= --github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= --github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= --github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= --github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= --github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= --github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= --github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= --github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= --github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= --github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= --github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= --github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= --github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= - github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= - github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= --github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= --github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= --github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= --github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= --github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= --github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= --github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= --github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= --github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= --github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= --github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= --github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= --github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= --github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= --github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= - github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= --github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= --github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= --github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= --github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= --github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= --github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= --github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= --github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= --github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= --github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= - github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= --github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= --github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= - github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= - github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= --github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= --github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= --github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= --github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= --github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= --github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= - github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= --github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= --github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= --github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= - github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= --github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= --github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= --github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= --github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= --github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= --github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= --github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= --github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= --github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= --github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= --github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= --github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= --github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= --github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= --github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= --github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= --github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= - github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= - github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= --github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= --github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= --github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= --github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= --github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= --github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= --github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= --github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= --github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= --github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= --github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= --github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= --github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= --github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= --github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw= --github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= --github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= --github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= --github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= --github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= --github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= --github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= --github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= --github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= --github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g= --github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg= --github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= --github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= --github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= --github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= --github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= --github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= - github.com/hashicorp/go-hclog v1.6.1 h1:pa92nu9bPoAqI7p+uPDCIWGAibUdlCi6TYWJEQQkLf8= - github.com/hashicorp/go-hclog v1.6.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= --github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= --github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= --github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= - github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= - github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI= --github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= --github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= --github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= --github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= --github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= --github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= - github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= - github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= --github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= --github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= --github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= - github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= - github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= - github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= - github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= - github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= - github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= --github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= --github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= --github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= --github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= - github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= - github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= - github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -@@ -1474,46 +62,14 @@ github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU - github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= - github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= - github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= --github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= --github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= --github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= - github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= - github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= - github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= - github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= - github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= --github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= --github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= --github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= --github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= - github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= - github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= --github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= --github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= --github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= --github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= --github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= --github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= --github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= --github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= --github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= --github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= --github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= --github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= --github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= --github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= --github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= --github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= --github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= --github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= - github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= --github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= --github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= - github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= - github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -@@ -1523,143 +79,54 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= - github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= - github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= --github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= --github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= --github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= --github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk= - github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= - github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= --github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= --github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= --github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= - github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= - github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= - github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= - github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= --github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= --github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= --github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= --github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= - github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= - github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= - github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= --github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= - github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= - github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= --github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= --github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= --github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= --github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= --github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= --github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= --github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= --github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= --github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= - github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= - github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= - github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= - github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= - github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= --github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= - github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= - github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= - github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= - github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= - github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= - github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= --github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= - github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= - github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= - github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= - github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= - github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= --github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= --github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= --github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= --github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8= --github.com/nats-io/nkeys v0.4.5/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= --github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts= --github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= --github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= - github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= - github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= --github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= --github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= - github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= - github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= --github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= --github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= --github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= --github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= --github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= --github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= --github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= --github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= --github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= --github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= --github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= --github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= --github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= --github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= --github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= --github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= --github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= --github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= --github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= --github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= --github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= --github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= --github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= --github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= --github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= --github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= --github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= --github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= --github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= --github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= --github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= --github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= --github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= - github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= - github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= - github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= --github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= --github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= --github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= --github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= --github.com/sagikazarmark/crypt v0.17.0/go.mod h1:SMtHTvdmsZMuY/bpZoqokSoChIrcJ/epOxZN58PbZDg= - github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= - github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= - github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= - github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= --github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= - github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= - github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= - github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= - github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= - github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= --github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= --github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= --github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= - github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= - github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= --github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= --github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= --github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= --github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= - github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= - github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= - github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -@@ -1674,964 +141,108 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An - github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0= - github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= --github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= - github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= - github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= --github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= - github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= --github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= --github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= --github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= --github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= --github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= --github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= - github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= - github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= - github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= - github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= - github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa h1:wdyf3TobwYFwsqnUGJcjdNHxKfwHPFbaOknBJehnF1M= - github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa/go.mod h1:GtanFwTsRRXScYHOMb5h4K18XQBFeS2tXat9/LrPtPc= --github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= - github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= --github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= --github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= --github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= --github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= - github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= --github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= --github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= - github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= - github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= --github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= --github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= --github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= --go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= --go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= --go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA= --go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= --go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= --go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= --go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= --go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= --go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= --go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= --go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= --go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= --go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= --go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= --go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= --go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= - go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= - go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= --go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= --go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= --golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= --golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= --golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= --golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= --golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= - golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= --golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= --golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= --golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= --golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= --golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= --golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= --golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= --golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= --golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= - golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= - golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= --golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= --golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= --golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= --golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= --golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= --golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= --golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= --golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= --golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= --golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e h1:7Xs2YCOpMlNqSQSmrrnhlzBXIE/bpMecZplbLePTJvE= - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= --golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= --golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= --golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= --golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= --golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= --golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= --golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= --golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= --golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= --golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= --golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= --golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= --golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= --golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= --golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= --golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= - golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= - golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= --golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= --golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= --golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= --golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= --golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= - golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= - golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= --golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= --golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= --golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= --golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= --golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= --golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= --golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= --golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= --golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= --golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= --golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= --golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= --golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= - golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= - golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= --golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= --golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= --golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= --golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= --golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= --golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= --golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= --golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= --golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= --golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= --golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= --golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= - golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= - golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= --golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= - golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= - golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= --golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= - golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= --golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= --golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= --golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= --golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= --golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= --golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= --golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= --golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= --golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= --golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= --golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= --golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= --golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= --golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= --golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= - golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= --golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= - golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= - golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= - golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= --golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= --golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= --golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= --golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= --golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= --golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= --golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= --golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= --golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= - golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= --golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= --golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= --golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= --golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= --golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= --golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= --golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= --golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= - golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= - golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= --gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= --gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= --gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= --gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= --gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= --gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= --gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo= --google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= --google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= --google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= --google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= --google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= --google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= --google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= --google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= --google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= --google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= --google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= --google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= --google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= --google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= --google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= --google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= --google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= --google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= --google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= --google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= --google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= --google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= --google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= --google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= --google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= --google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= --google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= --google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= --google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= --google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= --google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08= --google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= --google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= --google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= --google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= --google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= --google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= --google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E= --google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= --google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4= --google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= --google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= --google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= --google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk= --google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= --google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= --google.golang.org/api v0.152.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= --google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= - google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= --google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= --google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= --google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= --google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= --google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= --google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= --google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= --google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= --google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= --google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= --google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= --google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= --google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= --google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= --google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= --google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= --google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= --google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= --google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= --google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= --google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= --google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo= --google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE= --google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= --google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= --google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= --google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= --google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= --google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= --google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= --google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= --google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= --google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= --google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= --google.golang.org/genproto v0.0.0-20230629202037-9506855d4529/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= --google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= --google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= --google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108= --google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= --google.golang.org/genproto v0.0.0-20230821184602-ccc8af3d0e93/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= --google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= --google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= --google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI= --google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= --google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= --google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= --google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= --google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= --google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= --google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U= --google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= --google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= --google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= --google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= --google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f/go.mod h1:iIgEblxoG4klcXsG0d9cpoxJ4xndv6+1FkDROCHhPRI= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= --google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= --google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= --google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= --google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= --google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= --google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= --google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= --google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= --google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= --google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= --google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= --google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= --google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= --google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= --google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= --google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= --google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= --google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= --google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= --google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= --google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= --google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= --google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= --google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= - google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= - google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= --google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= --google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= --google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= --google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= --google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= --google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= --google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= --google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= - google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= - google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= --gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= --gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= - gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= - gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= --gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= --honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= --honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= --honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= - honnef.co/go/tools v0.3.2 h1:ytYb4rOqyp1TSa2EPvNVwtPQJctSELKaMyLfqNP4+34= - honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= --lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= --lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= --modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= --modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= --modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= --modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw= --modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI= --modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= --modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= --modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws= --modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo= --modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g= --modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= --modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= --modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= --modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= --modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= --modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= --modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= --modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= --modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0= --modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s= --modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA= --modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0= --modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= --modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= --modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug= --modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= --modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= --modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= --modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= --modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4= --modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0= --modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= --modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= --modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= --modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0= --modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= - mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8= - mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE= --rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= --rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= --rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= --rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= --sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index c23bd6e737..9b613c6ff4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,21 +1,21 @@ { "aci": { - "hash": "sha256-Xe6RDA9Ijq6BnrTzlXHt+6hfNf7CkrJ4TY6dp4TUm4E=", + "hash": "sha256-4EVSO/DCuKSI3CPlaXSDxuy0pqAMBHRDwGJTBdQd61w=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.13.2", + "rev": "v2.14.0", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-CFyB6jLHtnHxY9LB5a3qaMVfz6isi1pSXcscVMM9QKA=", + "hash": "sha256-4H3isw9YRWJANez3qcJYnXO9yW2DoGUAoOPGI7mLXlI=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.21.0", + "rev": "v2.23.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-wqXMoByVqd2NxdFunK29Hq59pfQoXW+kHoH0dTcfFVw=" + "vendorHash": "sha256-RZmT31fetR46vFQRoLkBjadD6ROqvElI/jOZnf6FWTU=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,29 +27,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-6FcHqSXszJZkIX9wytkNU8+rKgBu34k2Xnfq6fcqkHs=", + "hash": "sha256-PCtWQP2FsYl5OITVCUp6OJub0uXDLJebWP310F4KWU8=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.15.0", + "rev": "v4.19.1", "spdx": "MIT", - "vendorHash": "sha256-SNpsdbNvgLOS8pSSvz58xThTqzCOOPZMggJb7HetzAw=" + "vendorHash": "sha256-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" }, "akamai": { - "hash": "sha256-WOLEKdY8GbvAREbWQqAdITGVb4erHmIMp9GT2CsKvTk=", + "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.0.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-g3U0w+gvrOzS8W3Cu+wpOlWo8JHUlBpxRkDDl6wzcXM=" + "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" }, "alicloud": { - "hash": "sha256-+3MgqAMcDfwhVW3zGSsjLfVWmVNWyrjtUqB9KYzdYRk=", + "hash": "sha256-x/hq45iqcKurjFeXsdycWqDlJ+O1/4f01+6ay6TDejY=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.220.1", + "rev": "v1.225.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -81,22 +81,22 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-qlmAOc4wSxQ9Xnr4zBB98OSFW4HB7w7yStsUNfsylsE=", + "hash": "sha256-4gE8+z4GZElmkVK9nVDriAolXJ95arNNKyIq88XAwp8=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v10.4.3", + "rev": "v11.0.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-P5L2Q8t9TxJnu5cjOwEKek1KNKAw78fqZoOSAo6AvzQ=" + "vendorHash": "sha256-5kdyDc3/jBvg6QNBivh8J4SrYgMd0dkiUHUx43wzepQ=" }, "auth0": { - "hash": "sha256-Yoje6btftS0slz2newORBbb9kTjWXaXzbP94YKT6+3E=", + "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.2.0", + "rev": "v1.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kBLyk8glOuvgpbGLUUwtzKecqDDU8VS3JxN6tPIhMro=" + "vendorHash": "sha256-oc6ZI5j7pqiiFgfbaTARb6sn+Ma/rqrupv/RPN05mrc=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", @@ -126,20 +126,20 @@ "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" }, "azuread": { - "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", + "hash": "sha256-8uGSVvYygkR8WuKVGYVGN5dq2LoFQx8tbNYLYVBW4LE=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.47.0", + "rev": "v2.52.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-kJ6snlePBGRqE8mS95ROzskz+b4cnPLz/OO1Vk+i56Q=", + "hash": "sha256-ukfUXWT1Q8jziaSMpZl2awaid9GfByl3TniG63JxkuQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.97.1", + "rev": "v3.109.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -153,30 +153,29 @@ "vendorHash": null }, "baiducloud": { - "deleteVendor": true, - "hash": "sha256-qLjAHoBnb6//QYxYZyN13RxWOuEjxwSOiPyfR1qMtro=", + "hash": "sha256-uKIBimMMTManwztb4vdMCpsRWMr6GB8O7vK850sVI2g=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.40", + "rev": "v1.21.8", "spdx": "MPL-2.0", - "vendorHash": "sha256-hd64VJOkl+BtMXR+VcGam8ycKdfuwmaj67cBxx6rS8w=" + "vendorHash": null }, "bigip": { - "hash": "sha256-cGFlVcu8G7xpiHk1dhgLIkZHc6srOn/eLyQk9xETpnI=", + "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.0", + "rev": "v1.22.2", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-rapsVhYfyASIn9zVQTwhAF4A2Taw9djYlh+sJXCpJNA=", + "hash": "sha256-fvSy0gnSQkpSCfKlmOQW+ItMi6utocsDB6ex4RZMvGo=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.40.0", + "rev": "v2.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, @@ -190,22 +189,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-DIquKLQB27deYYG3vMlhBoO/EZ5WK04zAR7qPrRQ38k=", + "hash": "sha256-/vyiQZ4UDe42sIxacgWDf+wktwd8ZXhW++gh+qF4C3c=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.6.0", + "rev": "v1.10.0", "spdx": "MIT", - "vendorHash": "sha256-1HYJ1k3ZK9rK/cDOXnJz556qqBkyikRxCBbOeJhl3Ks=" + "vendorHash": "sha256-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" }, "checkly": { - "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", + "hash": "sha256-xM3KJiWO1Lsw33talLR6gcalEm9gRffUOikdUQZ6AsM=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.6", + "rev": "v1.7.8", "spdx": null, - "vendorHash": "sha256-zxlKKA2bi+PV0T+znLAFEbTe5ynGfl0bE913GWojwEo=" + "vendorHash": "sha256-TgoTz9kFLhikfQYt654nmoGPzjVLfUMnUrs3mVqrgJo=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -226,13 +225,13 @@ "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-p4jRSFNalEzIs8k1QZBVSUERmdK0qVYdk4oUoQRtQww=", + "hash": "sha256-7MdXh5SIQwFPL5APmdrkrh++shZRbRUAYrVIHDGjM68=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.29.0", + "rev": "v4.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HgTjVtC5Z7/3b86fFHTcZE4vUukWtBdWFdwgWGQW9ZQ=" + "vendorHash": "sha256-og31UnUsXGgOm2dH0jlvEpvjOnxUlRy04s2TffiVX00=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -245,13 +244,13 @@ "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { - "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", + "hash": "sha256-CmlFKg9ZvcTBLbFjZEwPAKNtXUMNcsxraO4ECCud/9E=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.3", + "rev": "v2.3.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" + "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" }, "cloudscale": { "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", @@ -291,22 +290,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-zAu2zkC9saWg1Miu4OkqeXtNhGgboCzr/CRmtfFsAVc=", + "hash": "sha256-L6GXoyjTd2n2n79gPvmQ0zLhW0iDS8ZcrY1gxPaQ61I=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.38.0", + "rev": "v3.39.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vIdM7SEWYnBw30wGl7wM/sMl4xtRPTUQvhqGoJxfKBg=" + "vendorHash": "sha256-jK6GI44o1FoJw9eZaCbWz1zw3dHqyaS5664h+Z27OXQ=" }, "dexidp": { - "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", + "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.3.4", + "rev": "v0.5.0", "spdx": "MIT", - "vendorHash": "sha256-ejM1RmVBW3v0OStYzJTCym2ByWHJ1zzz/yWVbUiQWN0=" + "vendorHash": "sha256-xW0sPt2TGmoQXc5a2lp6471amBbDDPZbyc9YIIHP+M0=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", @@ -319,11 +318,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-wwb62tZZxpr7NXbiqcS40aF9E2msagj2Mqy4kogDsEA=", + "hash": "sha256-66bG22xNzJEjCZJ7pHY4OW1vj8qTJIXd0CF/0zLiyug=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.36.0", + "rev": "v2.39.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -337,22 +336,22 @@ "vendorHash": null }, "dns": { - "hash": "sha256-7PRRdL1LhcHKHqqdB7KvBsrrPjaYEKfoSPpc31/Ki/c=", + "hash": "sha256-D9Y4VjNWvbIC8LjMSJp+KqyV0LvomfaiqjkOItwAF/w=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.4.0", + "rev": "v3.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA=" + "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" }, "dnsimple": { - "hash": "sha256-aa5L1FO9Ro215zj3vH1H9k0fP2mYI5+TAvyPQumwWOM=", + "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XA6gvm4S5kwdW2uha6B5BUX5mR8HPOs3xgPgGdIc0d4=" + "vendorHash": "sha256-Zl98s0+sgs+n/OkrJMsia0MxqO/AGWId8zzY+/n6LXM=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -364,13 +363,13 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-PfqFf3V+zH4SPvciLNnB9KWCVm8M94q8rzedUuXABAg=", + "hash": "sha256-jDCmIHdfHi+gp3+HGo8Wh+xYiHVU2Zy0lxETKW2rvGA=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E=" + "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", @@ -382,20 +381,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-Wtt4vkHcDBTzObfpOSdH4RAfoT/1+B58PytJ1NSkyQk=", + "hash": "sha256-jnV8dg9CJ38YKdEmc0hxDDbl/YUQgPTM6D5YYVjjWFc=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.34.0", + "rev": "v1.38.1", "spdx": "MIT", - "vendorHash": "sha256-9+cytMN5VK0nwLiR58lzE+UzlvqI677/rOxzd8D5k30=" + "vendorHash": "sha256-25kuUGbBCHOL3RzQcLDzzdfQ1j+XvqJSEyIowV0Od8A=" }, "exoscale": { - "hash": "sha256-0PsMSEbMoeuoa17AZvzbSOoY48IeQ4CPGWknkc0tDQQ=", + "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.57.0", + "rev": "v0.59.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -409,11 +408,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-jjZKwxJeimutMuz8TdNLsLigiXidtfxdsptrxSo3940=", + "hash": "sha256-xoxxicu0bXoaISMNwZNM6G8bBz0GKv48ORpcABwSsg8=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.7.1", + "rev": "v5.10.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -427,14 +426,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortios": { - "hash": "sha256-SENWlcDkb6S73yKratGSlT151wWuR43B40SoK7Hb6Qs=", + "hash": "sha256-/4+FpytrKGDpl6ZZoZ6BpsiiqlxTcxRs+Ag4wVJ9NLw=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", - "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.19.0", + "rev": "1.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mE25KfP2+7K7nHpkQOn1pfilm+fz5kGDDW8U+P2zglY=" + "vendorHash": "sha256-eFPOY0oGjTw9JIHNJks5Dgv2vJyS/eaEi+bPQkdBFlc=" }, "gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -446,11 +444,11 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-K3/taXnlIroiWQYyZB2LElAcF5fQm2aaEp3OXqKCJ+E=", + "hash": "sha256-6RAGc1UXebNm24d4+7S0LugvpSVgjIvqa7B6y+pozkA=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.1", + "rev": "v6.2.2", "spdx": "MIT", "vendorHash": null }, @@ -464,22 +462,22 @@ "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" }, "google": { - "hash": "sha256-LV3/4X/4jA+mZrkbzmYqiQDOVkH3zie2YCc6M9voJpA=", + "hash": "sha256-YonRToq/xdUy584hlzG+0/olYPhq3yxBUEahGz1ODkk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.23.0", + "rev": "v5.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SUYBSggBAl63plYz1kf+BBL6yPKbHAG8cjJE1JquSQ4=" + "vendorHash": "sha256-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" }, "google-beta": { - "hash": "sha256-0eiMpPuia7M9IPhKHBWXiBXH3LenUonsbs2QdP4V1e4=", + "hash": "sha256-71eEmUUwSGM81kNwzvJ1QnkjMskdRx8BoETNSLIjYog=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.23.0", + "rev": "v5.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-y9m+rOuQWSooeZBMuM1irx0CtdHtOqmhKv7+f8GNO6g=" + "vendorHash": "sha256-2sqUzK8yxNKdfvrToCQWK8Eyr2n4ch6/KrrIAYmLwcA=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -491,49 +489,49 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-7Hv0jAYnTh8B2xpxIlMdQL3mVANSRYRyG5OTHZLp4wA=", + "hash": "sha256-VEg95n7S4PDWjGPbuADOQWymGDlS4jupQAHo2OCkfAA=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.14.3", + "rev": "v3.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-NAUFTk868XhzLu5boP09JeZbMs1exqOmHkFa9MUJFns=" + "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" }, "gridscale": { - "hash": "sha256-gytjUn1xy8HTgItYrxrhm80qrbrjdDQvEcGLZ49VC+0=", + "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.24.0", + "rev": "v1.25.0", "spdx": "MPL-2.0", "vendorHash": null }, "harbor": { - "hash": "sha256-Pv4Eoswmx+FVVq6jqP69bCMrUmt5persxdrtvY9N79I=", + "hash": "sha256-dlAjbiSSgTuuZhTML66l4mSa3Rf14G86++RyXUJYbkw=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.10", + "rev": "v3.10.12", "spdx": "MIT", - "vendorHash": "sha256-1zaC82m8ylkz4lSocDVoXjF6yWWEL4He0lIKXs/7VtE=" + "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-D7RBrpOxfSfeip7z+mAkWBjSTVnnM/MfN7Qvl/E+nA0=", + "hash": "sha256-2eCHgHh6SVSHqjf+h4tRaD1orzh1LRUNVJdNsfLtZMc=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.45.0", + "rev": "v1.47.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sipYN9Z76fib4j15VIn/1Rn7QelNNB2+KeFn5rIA6hM=" + "vendorHash": "sha256-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" }, "helm": { - "hash": "sha256-Zj0mZfQhZimk3QozKHNU7quO/SqV3278Y+l9bFa8w/k=", + "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.12.1", + "rev": "v2.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qoXWnAbjRsvFDtlDCfeaIjc5hZIbCgosyH0pXhHkWiA=" + "vendorHash": "sha256-p6VUNSJKJtPrawdsi8Lgmu0uYjRmsdP4nsOl2L6h3JA=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", @@ -554,30 +552,29 @@ "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { - "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", + "hash": "sha256-Kc3L8oqQOP+k8PZAWkRApDj+3LRgs3P3mm4vX2QcUdg=", "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", - "proxyVendor": true, "repo": "terraform-provider-htpasswd", - "rev": "v1.0.4", + "rev": "v1.2.1", "spdx": "MIT", - "vendorHash": "sha256-6jaAgyHS5H63YKnm4xcYmjKVhPbWm6KK6qHzxg/78yU=" + "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", + "hash": "sha256-fGJBrgobtDAOPXnAIcmuepgCRVIdSCABQlP+dycAm+E=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.2", + "rev": "v3.4.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" + "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" }, "huaweicloud": { - "hash": "sha256-yYMI1UuOU/DbGYqReI//zhBmlD96KYot7h987k4Cl6o=", + "hash": "sha256-04y0G3555aRnB3Zc9TgeYOMo1QyJ9ns4r85AikXSNE4=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.63.0", + "rev": "v1.65.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -618,20 +615,20 @@ "vendorHash": null }, "incus": { - "hash": "sha256-GahwviyhXcrCtM0jjJKKEwHkZTcJnVPB1JlVsJjcv+k=", + "hash": "sha256-nyL8sWFgTlJjuAYhBuzThCm89UHwYmb+x+A39z2FCj0=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.1", + "rev": "v0.1.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-/SpaWENm6nwveUACS7hvH/Z25CTzQK/6igPhTW/fYJ8=" + "vendorHash": "sha256-81ykw34Qj5qAAa06p7br94bvlIM4uNiKNUI8d+Gw07g=" }, "infoblox": { - "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", + "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.5.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -654,13 +651,13 @@ "vendorHash": "sha256-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" }, "kafka-connect": { - "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", + "hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", "repo": "terraform-provider-kafka-connect", - "rev": "v0.3.0", + "rev": "v0.4.1", "spdx": "MIT", - "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" + "vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0=" }, "keycloak": { "hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=", @@ -681,22 +678,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-l2WPpczgKjDYxtZFqhqmJvq8CdsAIBQBeofZOn7BLzM=", + "hash": "sha256-MlM7OEpzDOmM8BaaGYn6ZSDaIO8IswreOIkLOkbqQHo=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.27.0", + "rev": "v2.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" + "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, "launchdarkly": { - "hash": "sha256-C+RGrw+XAaAekKkwvf5gtoiXghSJuByUJvyKgUt/DSE=", + "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.18.2", + "rev": "v2.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NCyEU30hw1aWB7T8sM3lrJEUtPdWlbCGdWDaRgjeJdM=" + "vendorHash": "sha256-pO9QTtqA+YG0i+o1+p3PYg8E/mUpzIV3II++CxQcuHE=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", @@ -708,13 +705,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-BZoMNx0a+dXMpY/YaYKEL3dQonGELlNzDVtOq7Z4Yfk=", + "hash": "sha256-6q1x34SWBCDi1jGoyNoxMAtHqxqP3qAVk1MLMLIRbg8=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.18.0", + "rev": "v2.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1okvZTEycuGymzcKtUNrxZpiPVoc2ykMxMUbq8mgEOw=" + "vendorHash": "sha256-ZQkFp9UXhY61YgtPVaWOSoQIYNcaTs9V/iwZ+UDRluA=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -735,22 +732,22 @@ "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { - "hash": "sha256-culY1Im8D4CtgC2LtTFFB0BgrNgLfDLT0I290+0NE3A=", + "hash": "sha256-z7AjOKMSf2XnyCQiBcjFY0V9mDLF6Fj54Ck7971Ehio=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NHf6xjbbDHsTdjzZ0gIa08PE53Bjv2llBRIgNTx7fj4=" + "vendorHash": "sha256-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" }, "mailgun": { - "hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=", + "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.5", + "rev": "v0.7.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" + "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8=" }, "matchbox": { "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=", @@ -771,31 +768,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-qP862jjbYks+6DR5eGzVlCvYyfupejqaxD2CgwSZxdQ=", + "hash": "sha256-EGVIk828DwYGMkRBGs3Lnt9goYb+biWoZcXmfuy/OPg=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.4.4", + "rev": "2024.6.6", "spdx": "0BSD", - "vendorHash": "sha256-r5fOj6YsW8ggoEbfyLvJDmD9P8WQ1J5K7ztg/NYm6y4=" + "vendorHash": "sha256-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" }, "minio": { - "hash": "sha256-dgMK61jFXnOvE11FIoIJfFN1zb+N9HrFZ/WtQqwktbw=", + "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.2.0", + "rev": "v2.3.2", "spdx": "AGPL-3.0", - "vendorHash": "sha256-Uxexx5sK6D+EEEPWLnWFE0HPG1RKUsYnSJ/1bV9JBkw=" + "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-xdPR0wyDEsyJCzRcGuDNhD4K+19KhZXsGxygoDadfvY=", + "hash": "sha256-TitX99F/jx2q2FOSmJAGLprhFSsG4CBdmKQhzNqxotk=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.15.3", + "rev": "v1.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-1cbmarVuMIkLuEBo2+O14wHqV0hbT/Jxh0sWRvfnDoE=" + "vendorHash": "sha256-Te8Kd+1B3T3Ngo+xKgiqjnm5CZ2QRNXEQxPlaLPXNRY=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -816,31 +813,31 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-npQn5eN3dGXy7bgVXpobn1HyVemrdxD5sASubbpY7qs=", + "hash": "sha256-UxSWEejkEH5VzPWXc2RZ5ho8rtvwH6zYUEP+W/r4ny0=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.34.1", + "rev": "v3.38.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Riutsej7+FISe0wFH9lGghyR5D6Jv3WbP3a33pqVBzU=" + "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" }, "nomad": { - "hash": "sha256-+S78qH7xMvJEGvgTRlxADNZI24PNgqCj1xgmIl4Oif4=", + "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.2.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-f/L9ZkirFIb+Yu2H4wz9wCb65NCC0TsmEnZPCI4Z6gw=" + "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { - "hash": "sha256-ZGqHIzK7tv7WeKHE8w11lOfDeWZqhi/88DOHcDaYHNg=", + "hash": "sha256-KbtMwLgwCPHilzQ22oco99q6c5+0B/9OXoc0IZXLLVk=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.2.1", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mOxhYVsq/yl1BqMyRWmLM/YrncMTlqiUo4GdAObH3ZU=" + "vendorHash": "sha256-kQFlW6G20x1OJNywb+KfJC1A7XSdgHlif7/szUOBuhs=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -862,22 +859,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-dGFpk83154mQlH2iM52mo+208MAU4BYBOOBH529QmRI=", + "hash": "sha256-EcemPlqHB3Ggra0o1rzjxAGtcpBKpUp3/H8zS56COYA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.36.0", + "rev": "v5.46.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-PaiLWAvEW7YKAWgd6n0ZaLFrkq+5GxV+O2eF5nPZAeE=", + "hash": "sha256-GHC2HhpyPBQ5gPg/HPmP+Bms6O5mLhdAysKW58FWhwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.8.0", + "rev": "v4.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LDKnlCxp1NWSWjb0vujoq3npeQXfyT+dJK6gp1gMQDc=" + "vendorHash": "sha256-71z33jsQmNQoCVSQCiyjHnfUMtwY+KB5Mn2MHItwGa0=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -888,6 +885,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "onepassword": { + "hash": "sha256-rdS9Udzfc/U7E4CIyySnntOCVBBZL0/GuAiVCI5uMrc=", + "homepage": "https://registry.terraform.io/providers/1Password/onepassword", + "owner": "1Password", + "repo": "terraform-provider-onepassword", + "rev": "v2.1.0", + "spdx": "MIT", + "vendorHash": null + }, "opennebula": { "hash": "sha256-Bz/JKPbdxKS7VDnQoXnZ5ajqh++ujl+4wIS49BDtT94=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", @@ -898,22 +904,22 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-kD1UfsnSLMFBzPZNguT3XaIXk0+Tp4qCPfNV3FonaIo=", + "hash": "sha256-NSfKyXTuPiEYFE8guWsRcJsKiccMrHJRK4I5REzzIZQ=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.54.1", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" + "vendorHash": "sha256-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" }, "opentelekomcloud": { - "hash": "sha256-wRKwrxZbT2z71gVE+O8bLjZmRGsZDhdn4raShedV4kc=", + "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.5", + "rev": "v1.36.12", "spdx": "MPL-2.0", - "vendorHash": "sha256-Xlba/lceTt1DPtHZxeIQqbscl+pZl7hw6xJXleXd0r0=" + "vendorHash": "sha256-PwYc9p8nRe0QkgLKLOeb7KYTLgFiT2JQGsmTfFLzBH4=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", @@ -925,20 +931,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-SGezO0L/rt5rnIz3LijkKdXn0+EPlmM/rGQ/aB2GES4=", + "hash": "sha256-346lBl1AnEdZmLEfsPiTW7I6rhOv61t004DBx7gRkF8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.40.0", + "rev": "v0.45.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-joR7uucMEBbQIuec29m+t3w5W/omgzexg70+Sh2MeBY=", + "hash": "sha256-GB2U+JBMAj+ePay7CYHWv/daLzVm+V+5YoADJ6uQp+E=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.11.0", + "rev": "v3.14.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -979,13 +985,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-U3hm1BqqePffuLBg+U4hgzcZpk+VCLhE5GsnRRYKT30=", + "hash": "sha256-CuUHTuq2ufSuolpvfkT4Q30tiIGkpuIoYCYqY9EOd9s=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.5.2", + "rev": "v1.6.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-2gVJpNRIEO/mTBg3m5CoxpeC2U09hnV9bPi5537f1Mk=" + "vendorHash": "sha256-UcoTldBVqCPh1SVaZm2aKeRVCVfgE/zGOR7+feDEUM0=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1015,22 +1021,22 @@ "vendorHash": "sha256-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" }, "random": { - "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", + "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.6.0", + "rev": "v3.6.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-f89G4Ln6JX1uJNeH7Vv69Fkibh1K3jOiULVvcn4ILao=" + "vendorHash": "sha256-No5XSWYIDmlxA9iczZWXXRZyy8JRSefPk36usv+Tf7c=" }, "remote": { - "hash": "sha256-x0mTouv+hRGznyn2XxohWzPb0vjJvJf6kDlWrLJ/JvA=", + "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=", "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", "repo": "terraform-provider-remote", - "rev": "v0.1.2", + "rev": "v0.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" + "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" }, "rundeck": { "hash": "sha256-VPkHnSOTnRvvX6+K0L0q5IqSSFCE6VPdg2BaSejFMNc=", @@ -1042,13 +1048,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-TRmBSATsynbvRg9TC6kYPbzV3Y2X9Kr/3FjyMe7Kj6c=", + "hash": "sha256-VTtS5iqeMzcaVveMlnJZDrXUSf0Ts/FG7STVix08mQs=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.38.3", + "rev": "v2.41.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-hUueCEaNuTQFD17eyne7LMUr5dXdycLFJ7/d9AJh3F4=" + "vendorHash": "sha256-eLQLozDXk83vjfTrsJHQqU3GMZToMwvjadqf+X7OeOU=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1060,22 +1066,22 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-HgHgZEo6fKxunbE5W8LUVukvmGpEc0bqbpO/ZcdwmTE=", + "hash": "sha256-yIQdxwkcpFKm2+woHW7yClWAwQr82XaCDFHh6KAOaQI=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v4.1.1", + "rev": "v5.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-VT9A7x7CAKJjuCXLI42s6WDy/XSME0UYLU6k1YcreU0=" + "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" }, "sentry": { - "hash": "sha256-sUXOH0cbD5Zf3e4KHLUYM8vu2knJdfIWZ+fq9HMfJ54=", + "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.12.2", + "rev": "v0.13.1", "spdx": "MIT", - "vendorHash": "sha256-C4gyHcfWN7v5a5gB8CjoDkAlqRxgd6bpsT8n9St2tEM=" + "vendorHash": "sha256-nMI79G1e1+ISdWNjL0Qh/pD8JkD1/1khNkwULU6PyxU=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1087,13 +1093,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-n8IpbCt8DKl4AIurIy5NnoZ3vWJyqrQvYEho6UEDmWc=", + "hash": "sha256-JPL2VjYIg8qW9kk6QaT3+alWtMvKHXRlqLD6AZ2+cQ0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.1.1", + "rev": "v9.1.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-aw1q9iCQKu4SynnbTRI8Tx+UbKWjG+2PFS5iDIirgh8=" + "vendorHash": "sha256-uPAWL2BigYiazZQSScM/J39dLDtYheq2P6l4A9M3rOA=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1114,13 +1120,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-X0VD4aI7WzNsy36e39eWzn2IIaLuXnhFSgiMnbb4myU=", + "hash": "sha256-3vC246+XoCfmnEdNFHW8iy0fy5aN+kmaZzgJot4hKs0=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.87.2", + "rev": "v0.92.0", "spdx": "MIT", - "vendorHash": "sha256-hvaZBOeAVutoKv46BLE1ud1Ox0K0InpTSG5G2WwTj5s=" + "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", @@ -1132,13 +1138,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-frnDZx02Kmp2C0djkZYfeZ6WsGc9mFUNmpajsfx8FCI=", + "hash": "sha256-6bdOwmAKxP7EVdRV8vw6b/lewPm35zE9T0Dah6NL5FA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.168.1", + "rev": "v1.178.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pf9FsI11CKANee0dM0djLVF1xwztKVlb0bVAkp/6zbc=" + "vendorHash": "sha256-c6vs7FypPQybAzFAsTnOGVjVLhhmj6v2/O0FU1z6X0A=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1150,11 +1156,11 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "stackpath": { - "hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=", + "hash": "sha256-n1IPOJ1NlguNMJASCXjNNUK0b5wGYe29aTcw7fNwVcU=", "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", "repo": "terraform-provider-stackpath", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", "vendorHash": "sha256-G+5vSXhxmt0Qsqt7vnecPZfIxAonNF3l7ygQZ0nemnU=" }, @@ -1168,58 +1174,58 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-wGqOUeDJs80s5xNsnJ4uLg6DXxcZA+P30XtY4DyCDzo=", + "hash": "sha256-ei5BxMyrx4CyVYl81DUDxLdbjGJBiTZWiFylhUFTr0s=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.28.3", + "rev": "v2.30.1", "spdx": "MPL-2.0", "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" }, "tailscale": { - "hash": "sha256-hvhdaxO7CbsfFzDw0UuRxlgRwvumWPz/I65IgounflQ=", + "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.15.0", + "rev": "v0.16.1", "spdx": "MIT", - "vendorHash": "sha256-+XgYutJTSKL6HmAX4GLnktqcM3AxYP7B1UHzAp/Oz78=" + "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, "talos": { - "hash": "sha256-DoO2aGoBkuafPJGNz0opmkFw4wwUgsczA2D0bSXQAlg=", + "hash": "sha256-HsblGVHCrOdNDGfNGyGjZxC1LmzZHxjOzknYmY2/BU0=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.4.0", + "rev": "v0.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" + "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-pjxEcA8K9n70FWMwpTXr8fwOCj/GVmiL9XfKLRLQ6tI=", + "hash": "sha256-ISx/kc3Mi/EBnzfrMojRTsZEG10iPqKMB8Ac8SzBZmY=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.6", + "rev": "v0.0.8", "spdx": "MPL-2.0", "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" }, "tencentcloud": { - "hash": "sha256-nYQVrWpCiDTXJ6BA9dwXkslGF/dvlT+E8WBD7By91Cw=", + "hash": "sha256-RR7F+sZl/btVEsybmKFxG3yrE7PkvdstMuDAJwx4Ggk=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.86", + "rev": "v1.81.105", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-5Txgqf/4dh2fsB6guqgLs3PxZs1QB32NzqCFIwM4ogg=", + "hash": "sha256-mfJtQs+fl7zfysWJO/EBM/DMYYOvR5nuOwDA6sei1PI=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.53.0", + "rev": "v0.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7rMBmB93dLPyd9VcVc9R8SnXQ0XkU6SHc6j/KiAODVg=" + "vendorHash": "sha256-heMfI1NLjOHSKondXY8mRCNWFedSYJqfn9nU2Ywj57c=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", @@ -1231,13 +1237,13 @@ "vendorHash": null }, "time": { - "hash": "sha256-yRYGyDPMR/2+OOjqXj1OhpvYoAUEbgWPcW4PcatPPh8=", + "hash": "sha256-Uwe0VpY7CKXNy6RNS+yoIkyLmMQ2daJ5x7IhJV+KuxU=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.11.1", + "rev": "v0.11.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UZ0DpurmLmju/MG0uhAXgbwQoas94/R9TNT1cyO6pIQ=" + "vendorHash": "sha256-dmBCjbVmK4Qa07bcgUxKch5Vj7nylgNA7rzx+7ag3CY=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", @@ -1268,49 +1274,49 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-u9LxsBKmS80h4y+/nJZ+0+cmQP5gS/I+T5g8H/QlPDA=", + "hash": "sha256-mPTejWXREIBjEZVb660bUUnyj3z7hgfKPrUsSVvMx7A=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.8", + "rev": "v1.39.1", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-LGjH/nQj18v8qjwJEU1CkrauGqSizsTpl80Q5jNIwUE=", + "hash": "sha256-9a8K2Yl3hfmUG+/QgQJdXnW6lxkOJps1BskFto3tIwg=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.19.2", + "rev": "1.23.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-QC5EWVSkBDMfLR2f0u0K2LOn6FaHCeFkNJeq8vWQp+o=" + "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" }, "vault": { - "hash": "sha256-Pdh2rudUwOgY292JPPrvxIABHC+/dBYK5iNTaHZ9ed0=", + "hash": "sha256-tPRwdSwygypfgXAS3QmZNAb4GXe/8IFsRs8YGa4HDJg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.2.0", + "rev": "v4.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-b/1g/1hFbIfzYJ0lQKNzalLkD95LLRgoftuoeDicalE=" + "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" }, "vcd": { - "hash": "sha256-yywk60Ae1Ch+kuOqoKfAqrOhUAbJVQxA0wJW+CfZ4CY=", + "hash": "sha256-f5uoRyf8uW/hJ9MAbi9KdViWh8CMR/FlQyJtAY5pEvI=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.12.0", + "rev": "v3.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-53Cj5ooDsg91iiuYzjAt9u9S40g6plcz6lqlnawNFNM=" + "vendorHash": "sha256-vKfHRTmTRxwDijEA1l4IyjBHS5kZx9LcGfprUntVg5w=" }, "venafi": { - "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", + "hash": "sha256-0ea6ael4NQDHFOrXsMKE/KRRpARKjrxPBFykB8Bk1JA=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.18.0", + "rev": "v0.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" + "vendorHash": "sha256-PPoPNl7Lc/siAAupLS07vbDipAO1Q0mmDuqSE5/om50=" }, "virtualbox": { "hash": "sha256-Oijdx22s7wIDC+Sms097rFVNRF9tzMlUNlPMV7GSsiI=", @@ -1331,29 +1337,29 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-v/0LBzyUUqt+Jx4GubCC2QzKdgt5WrrjZ4YvfxA2+GA=", + "hash": "sha256-KzxthTn3z0kZTUTKO8zq6DaNMTnfb7gFlbuWgxZtqwo=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.13", + "rev": "v3.0.15", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-SATX9BO6tnHW8+oeSeMNP3+opKHBk42va2J8YdrnlUw=", + "hash": "sha256-BCEUFIw47o7lFmOaQ/SBk2n1bPnvzAwdxeuuMNx4OgA=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.7.0", + "rev": "v2.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-cHzIOIGy5DT5q5fvQlv56V6/vU0akBFM34M+c2+qIy4=" + "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" }, "vultr": { - "hash": "sha256-+J4RHQWOy4Wfv2/8UNHe8g2fp2yAxzqzZZRv749B3Yc=", + "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.19.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1367,12 +1373,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-mlai++RjiYFSJLkhyWyKKYs/LFVoKIHtFB2bGmB5DFM=", + "hash": "sha256-PTlnXq30roG1ueLJM5aGSeuDJ5zukmU33T9Qf7cnxd8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.112.0", + "rev": "v0.122.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eE8gYyIGVBmw02I6j9GoEm2TiOmHGWhOs5pcqj/6PaA=" + "vendorHash": "sha256-Lo847kKBWDFeN3t7T/akaQ8gkU7b+p1BSSi4ddLLDyc=" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 8a39c31f11..509b5aa557 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-Dqz8UFoGb5uG5f8mrIUIRWJUYH/ZuFavhRy2wie75/Q="; + sha256 = "sha256-1jhhZosrU2zTlgMhM7vJ2kLpO+BITPdUo0t3rcbDYjg="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-L1QTqw0L/aE4bFlLWg4/mmdHL7Sb5EsT3eL0jZIpBsA="; + vendorHash = "sha256-J0fYfSbxL4R1ac6ezM03e1+J8n7+CRSujVU6XDCyPU4="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix index 31b8330bfd..da61b26840 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.23.8"; + version = "4.24.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-YmXpbSrbibkH0+DKE+ujFSLqxnWiA3XpuQSzOQUyEOo="; + sha256 = "sha256-6Bd6IeuCXVnK8ZPgU9FOSNqoYf3ZNpkSBC+cR5JU9AQ="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix index f35b1e909b..fb1b954636 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.38.0"; + version = "1.38.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-9bEPkEeKOVFETSo5HEFWbuhx7+mWwogGm1jN18Vj/Sw="; + hash = "sha256-9n8XAeSZn2HD8Vg2B8YmBUQ+VPBglgjN+QjrSOgn65Y="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-eWDnZNNXgvIiDiKEpkVEL/JpEfy7WKtSAUA6riCrMdc="; + vendorHash = "sha256-2lR2/jHOFmKm3s+EPNRFLlgJHIs+33YDt1YeHBWRin0="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 681ba5cc59..d8c4089eee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.11.0"; + version = "9.12.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-VnIMcpTlJT6E4DhGuKos2STbwAfdRNFs2XnodcqB+L8="; + hash = "sha256-nzSgJrlTRN4LDcdjvCIBwjBJTRRoch376R4PIbvcajQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix index 87d1d53c9d..4b04be48d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,7 +11,6 @@ let pname = "beeper"; version = "3.106.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; @@ -25,7 +24,7 @@ let }; in stdenvNoCC.mkDerivation rec { - inherit name pname version; + inherit pname version; src = appimage; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 428715b6f1..b818baa899 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -23,23 +23,17 @@ , webrtc-audio-processing }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${version}"; - sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4="; }; - patches = [ - # fixes build failure https://github.com/dino/dino/issues/1576 - # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74 - ./fix-compile-new-vala-c.diff - ]; - postPatch = '' # don't overwrite manually set version information substituteInPlace CMakeLists.txt \ @@ -92,7 +86,7 @@ stdenv.mkDerivation rec { "-DRTP_ENABLE_VP9=true" "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${version}" + "-DVERSION_FULL=${finalAttrs.version}" "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" @@ -133,4 +127,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 7c0d9c7b1e..6b4af03b5e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.isLinux then { - stable = "0.0.56"; - ptb = "0.0.90"; - canary = "0.0.431"; - development = "0.0.19"; + stable = "0.0.58"; + ptb = "0.0.92"; + canary = "0.0.438"; + development = "0.0.21"; } else { - stable = "0.0.307"; - ptb = "0.0.119"; - canary = "0.0.531"; - development = "0.0.41"; + stable = "0.0.309"; + ptb = "0.0.121"; + canary = "0.0.547"; + development = "0.0.43"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-HpdsvzWtB4AoqZXf7LV0J50/OQDsYgK8bkQ1HGvu7Ec="; + hash = "sha256-YkyniFgkD4GMxUya+/Ke5fxosZKHKyc4+cAx3HI4w8c="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-75YnLhgNTd7pwpTE9qSIF0rzBwmGJ/CYa+YgN3OQZ2w="; + hash = "sha256-1HbTRWl1w9cu7D4NNFGVbHk1hvRmMywH+q2qA4+nokc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-59Sv3U3osfk+QoXgorpqK7CU0nJBdpFOMkoGRgHN3v8="; + hash = "sha256-z2SsI1vmaW1HjBDkJEH468xPuyAqigOIbRDtaL4Lgxc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-RP6SUM4DW3JhddSbJX6Xg8EE4iqCkSOgBL1oa7Zwp/E="; + hash = "sha256-LgRrQ2z0/mx9Xvkb7hOrhmOqaETiBITgJDO9vce/wtk="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-FBYxQhtwctMQ8ByOgAVncWh5297k1Vh95w/rWnZg9Fw="; + hash = "sha256-9Tfn+dxvhgNjSdfj8Irb/5VU3kn39DX6hdKkppJ6HeU="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Y5t6ndecfRf3zVfYEvFGiFinQxRSa7VyfnkAors8VPY="; + hash = "sha256-3Lk+kPZcBqznIELVMdA6dRpCOaOuRrchmfHv/EAyyOQ="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-eMJ/OKi+k92QEk140UW3RIi5G/UFlR6mW9f8kPZbFaw="; + hash = "sha256-ec2XF3023bQn/85i1xO8tTuYuprtsaL9exqRiZam36A="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-RiGyca/zjPpENgcq9KnRh5G4YArrUOQeueUdUBgZgjo="; + hash = "sha256-PZS7LHJExi+fb7G4CnIFk4KQx9/cL4ALXwzOcLx4sWU="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8a1052d04d..8390d77934 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -8,17 +8,17 @@ let pname = "mattermost-desktop"; - version = "5.7.0"; + version = "5.8.1"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 82d1fdff2e..7e40f880d2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { - name = "${pname}-${version}"; + inherit pname version; src = appimage; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f39..4411fbc6e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { atk pango freetype - libgnome-keyring3 + libgnome-keyring fontconfig gdk-pixbuf cairo diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a6855b2539..808fc19418 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.3"; + version = "0.13.4"; # 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-JNDl/esJdY+L+CGCAauPSeUID5eAaKChHqMf+jl4HuQ="; + hash = "sha256-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 8621aaf1b3..d6a543b77a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/third_party/nixpkgs/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.14.0-beta.1"; + version = "7.15.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-SC7CCqylPkc/qmlSYlXJcVWGi1+hvRQ9qBGR6wqo6sk="; + hash = "sha256-RnaYRd7hKTazh0dEX3wv0fFsdbYv0aqNJtswv8/f+YU="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index c4f59cd3dd..fcd1e22cf4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/third_party/nixpkgs/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.13.0"; + version = "7.14.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-lwo5O8UAjjMuaeM8J804oN+y72uYZBL+eP/NwpnD4H0="; + hash = "sha256-nRvGpAKRIPgXStrVu4qSMoW01SACV/wW/c05lLncCW8="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index ef0a62ac9e..05803ede09 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240615-1"; + version = "20240627"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-70lHZXGdPxT2d15oZW/hKrPS1qfpxH8O5jnyGy7CVz0="; + hash = "sha256-Kvz2Ft7gcvyQr8CxTZ7bHVn7q0yItGsK6/rChz0eras="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0732ec039..70c924a27a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -220,7 +220,5 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index f6145678d3..29a1fc8ede 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mEpeuopMzZhWOAikEP7Er8xcgNkGbCTkJJYrQr7GrBQ="; + hash = "sha256-VEcBPiekjiDjXYTz/gqjES8N77GgwPdWRUJJ3twLmgU="; }; - cargoHash = "sha256-U9L4SrYTAUcQ9/2f8tD7jxByVQS9P6OXpra6QvbhNNg="; + cargoHash = "sha256-uhm6Z4oJ8w1tN3VDtCNF2/pixNLCXnaEg8yyUSTJRnM="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index 781508179c..65f1635301 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,17 +1,54 @@ -{fetchurl, lib, stdenv, dpkg, makeWrapper, - alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, - harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, - nspr, nss, openssl_1_1, systemd, wayland, xorg, zlib, ... +{ + fetchurl, + lib, + stdenv, + dpkg, + makeWrapper, + alsa-lib, + brotli, + cups, + curl, + dbus, + expat, + fontconfig, + freetype, + glib, + gst_all_1, + harfbuzz, + lcms, + libcap, + libevent, + libGL, + libGLU, + libkrb5, + libopus, + libpulseaudio, + libxkbcommon, + libxkbfile, + libxml2, + libxslt, + libwebp, + mesa, + nspr, + nss, + openssl, + snappy, + systemd, + wayland, + xorg, + zlib, + zstd, + ... }: stdenv.mkDerivation { pname = "viber"; - version = "16.1.0.37"; + version = "21.8.0.11"; src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,51 +57,61 @@ stdenv.mkDerivation { dontUnpack = true; libPath = lib.makeLibraryPath [ - alsa-lib - cups - curl - dbus - expat - fontconfig - freetype - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - harfbuzz - libcap - libGLU libGL - libpulseaudio - libxkbcommon - libxml2 - libxslt - nspr - nss - openssl_1_1 - stdenv.cc.cc - systemd - wayland - zlib + alsa-lib + brotli + cups + curl + dbus + expat + fontconfig + freetype + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + lcms + libcap + libevent + libGLU + libGL + libkrb5 + libopus + libpulseaudio + libxkbcommon + libxkbfile + libxml2 + libxslt + libwebp + mesa + nspr + nss + openssl + snappy + stdenv.cc.cc + systemd + wayland + zlib + zstd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - ] - ; + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + ]; installPhase = '' dpkg-deb -x $src $out diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 9a76be5704..ebdb19ee5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.0"; + version = "1.1.1"; - vendorHash = "sha256-U7zh0MmuDmKQWa4uyoFDctPUfq+52Im6t2TFyWIGXAs="; + vendorHash = "sha256-pCp2ox08wWUdAnqBqoiMLy/qBQg1PsNnMl8nLCNifC8="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-z08LLJ/SI833wMpZJ25WDrc66Y4R5i2uGlE7Nc30Kk0="; + hash = "sha256-FnofI7IpG0hA9/60cILbQ7xnGKJ2zdYk/pRZPTyOmzA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix index 263d5e3342..9187e935ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-CemVlw0S4UmKFopWSh1Hv2znMRN3guIBx303esK/gLw="; + hash = "sha256-mTa+vdYSBcXTYlcDGJWktGVRC6NPBGcjb+syr/A1QIQ="; }; - cargoHash = "sha256-LgA6gdBRLsow98nv9A5rYb/v/FGzu/LPQwftyeuKHk4="; + cargoHash = "sha256-xTPx4P9SbOyC3YjZNxNFh65pSfiPjMKV+wgZtT00Me0="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix index 0536fa2fde..b9cd8e47d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix @@ -23,13 +23,13 @@ }: let - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-rMvFwWTrYWZUAMWd6H/SXE26q5ASjwsa8bD1tFC6yBI="; + hash = "sha256-rnuh0+i6W9ipSM61MXd9dTlIkdGUHMjtvElW/4S2YCg="; }; goDeps = (buildGoModule { @@ -43,11 +43,6 @@ stdenv.mkDerivation { pname = "ktailctl"; inherit version src; - patches = [ - # Install libktailctl_config.so https://github.com/f-koehler/KTailctl/pull/212 - ./install-missing-libraries.diff - ]; - postPatch = '' cp -r --reflink=auto ${goDeps} src/wrapper/vendor ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ktailctl/install-missing-libraries.diff b/third_party/nixpkgs/pkgs/applications/networking/ktailctl/install-missing-libraries.diff deleted file mode 100644 index 6153199a66..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/ktailctl/install-missing-libraries.diff +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt -index ed0a64a..970e509 100644 ---- a/src/config/CMakeLists.txt -+++ b/src/config/CMakeLists.txt -@@ -7,3 +7,4 @@ target_link_libraries(ktailctl_config - KF6::ConfigGui - ktailctl_wrapper - ) -+install(TARGETS ktailctl_config) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix index efc782e832..7132eca559 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix @@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"]; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.18"; + version = "1.4.19"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-YJmVAYT30JSngtHnq5gzc28SMI00pUSlm0aoRx2fhbc="; + sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock index 9cbf256ce7..fb0d7780c6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock @@ -17,6 +17,12 @@ 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.5.2" @@ -40,9 +46,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", @@ -52,6 +58,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "ahash" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.0.5" @@ -174,7 +192,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -196,7 +214,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -207,7 +225,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -300,6 +318,21 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[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" @@ -374,7 +407,7 @@ dependencies = [ "serde_json", "syn 1.0.109", "tempfile", - "toml 0.5.11", + "toml", ] [[package]] @@ -398,6 +431,12 @@ 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 = "chacha20" version = "0.9.1" @@ -486,7 +525,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -561,6 +600,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.9" @@ -570,6 +618,15 @@ 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.8" @@ -633,9 +690,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -655,7 +712,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -693,6 +750,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + [[package]] name = "dashmap" version = "5.5.3" @@ -807,15 +870,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "drain" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1a0abf3fcefad9b4dd0e414207a7408e12b68414a01e6bb19b897d5bd7632d" -dependencies = [ - "tokio", -] - [[package]] name = "duct" version = "0.13.6" @@ -880,7 +934,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -945,13 +999,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1094,7 +1147,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -1176,10 +1229,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] -name = "h2" -version = "0.3.24" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1200,6 +1259,15 @@ 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.0" @@ -1227,7 +1295,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "async-recursion", "async-trait", @@ -1252,7 +1320,7 @@ dependencies = [ [[package]] name = "hickory-resolver" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "cfg-if", "futures-util", @@ -1273,7 +1341,7 @@ dependencies = [ [[package]] name = "hickory-server" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "async-trait", "bytes", @@ -1536,6 +1604,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" +[[package]] +name = "intersection-derive" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + [[package]] name = "ioctl-sys" version = "0.6.0" @@ -1583,13 +1660,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1601,6 +1678,15 @@ 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.9" @@ -1708,9 +1794,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -1721,6 +1807,36 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libflate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +dependencies = [ + "adler32", + "core2", + "crc32fast", + "dary_heap", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +dependencies = [ + "core2", + "hashbrown 0.13.2", + "rle-decode-fast", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1729,9 +1845,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1794,6 +1910,22 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +[[package]] +name = "maybenot" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc2e64fe3f5fb1e247110a9a408449eff2259cc272cf57bad6f161e801ac962" +dependencies = [ + "byteorder", + "hex", + "libflate", + "rand 0.8.5", + "rand_distr", + "ring", + "serde", + "simple-error", +] + [[package]] name = "md-5" version = "0.10.5" @@ -1820,9 +1952,9 @@ 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", ] @@ -1844,9 +1976,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1879,8 +2011,8 @@ dependencies = [ name = "mullvad-api" version = "0.0.0" dependencies = [ + "cbindgen", "chrono", - "err-derive", "futures", "http", "hyper", @@ -1896,9 +2028,11 @@ dependencies = [ "shadowsocks", "talpid-time", "talpid-types", + "thiserror", "tokio", "tokio-rustls", "tokio-socks", + "uuid", ] [[package]] @@ -1909,14 +2043,14 @@ dependencies = [ "chrono", "clap", "clap_complete", - "err-derive", "futures", - "itertools", + "itertools 0.10.5", "mullvad-management-interface", "mullvad-types", "mullvad-version", "natord", "talpid-types", + "thiserror", "tokio", "windows-sys 0.48.0", "winres", @@ -1931,7 +2065,6 @@ dependencies = [ "clap", "ctrlc", "dirs", - "err-derive", "fern", "futures", "libc", @@ -1953,10 +2086,12 @@ dependencies = [ "simple-signal", "talpid-core", "talpid-dbus", + "talpid-future", "talpid-platform-metadata", "talpid-time", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tokio-stream", "winapi", @@ -1969,9 +2104,9 @@ dependencies = [ name = "mullvad-exclude" version = "0.0.0" dependencies = [ - "err-derive", "nix 0.23.2", "talpid-types", + "thiserror", ] [[package]] @@ -1988,7 +2123,6 @@ dependencies = [ name = "mullvad-jni" version = "0.0.0" dependencies = [ - "err-derive", "futures", "ipnetwork", "jnix", @@ -2002,6 +2136,7 @@ dependencies = [ "rand 0.8.5", "talpid-tunnel", "talpid-types", + "thiserror", ] [[package]] @@ -2009,7 +2144,6 @@ name = "mullvad-management-interface" version = "0.0.0" dependencies = [ "chrono", - "err-derive", "futures", "log", "mullvad-paths", @@ -2020,6 +2154,7 @@ dependencies = [ "prost", "prost-types", "talpid-types", + "thiserror", "tokio", "tonic", "tonic-build", @@ -2032,15 +2167,16 @@ version = "0.0.0" dependencies = [ "cbindgen", "mullvad-paths", + "talpid-platform-metadata", ] [[package]] name = "mullvad-paths" version = "0.0.0" dependencies = [ - "err-derive", "log", "once_cell", + "thiserror", "widestring", "windows-sys 0.48.0", ] @@ -2053,7 +2189,6 @@ dependencies = [ "dirs", "duct", "env_logger 0.10.0", - "err-derive", "log", "mullvad-api", "mullvad-paths", @@ -2062,6 +2197,7 @@ dependencies = [ "regex", "talpid-platform-metadata", "talpid-types", + "thiserror", "tokio", "uuid", "windows-sys 0.48.0", @@ -2073,19 +2209,17 @@ name = "mullvad-relay-selector" version = "0.0.0" dependencies = [ "chrono", - "err-derive", - "futures", + "intersection-derive", "ipnetwork", + "itertools 0.12.1", "log", - "mullvad-api", "mullvad-types", "once_cell", - "parking_lot", + "proptest", "rand 0.8.5", "serde_json", - "talpid-core", "talpid-types", - "tokio", + "thiserror", ] [[package]] @@ -2094,7 +2228,6 @@ version = "0.0.0" dependencies = [ "clap", "env_logger 0.10.0", - "err-derive", "mullvad-api", "mullvad-daemon", "mullvad-management-interface", @@ -2103,7 +2236,9 @@ dependencies = [ "mullvad-version", "once_cell", "talpid-core", + "talpid-future", "talpid-types", + "thiserror", "tokio", ] @@ -2113,7 +2248,7 @@ version = "0.0.0" dependencies = [ "chrono", "clap", - "err-derive", + "intersection-derive", "ipnetwork", "jnix", "log", @@ -2121,6 +2256,7 @@ dependencies = [ "regex", "serde", "talpid-types", + "thiserror", "uuid", ] @@ -2256,19 +2392,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.26.1" -source = "git+https://github.com/nix-rust/nix?rev=b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28#b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.8.0", - "pin-utils", - "static_assertions", -] - [[package]] name = "nix" version = "0.27.1" @@ -2280,6 +2403,25 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.0", +] + +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "notify" version = "6.1.1" @@ -2306,6 +2448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2496,7 +2639,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2522,9 +2665,9 @@ dependencies = [ [[package]] name = "pfctl" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e0c1e1bc65fb241166b7ec8278d89cc2432d41adcbe57ffe1095c81e1d7b44" +checksum = "27590368dee28aa01e3024b639818a6bf0ad31635d9eca000aad63021a59284d" dependencies = [ "derive_builder", "errno 0.2.8", @@ -2589,7 +2732,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2626,6 +2769,48 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +[[package]] +name = "pnet_base" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +dependencies = [ + "no-std-net", +] + +[[package]] +name = "pnet_macros" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "pnet_macros_support" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +] + [[package]] name = "poly1305" version = "0.8.0" @@ -2682,7 +2867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2711,13 +2896,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.4.0", + "lazy_static", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift", + "regex-syntax 0.8.2", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "prost" version = "0.12.0" @@ -2736,7 +2941,7 @@ checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -2745,7 +2950,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.31", + "syn 2.0.51", "tempfile", "which", ] @@ -2757,10 +2962,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2788,31 +2993,11 @@ dependencies = [ "serde", ] -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "quickcheck_macros" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2879,6 +3064,16 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -2888,6 +3083,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2926,7 +3130,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] @@ -2937,7 +3141,7 @@ checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] @@ -2946,6 +3150,12 @@ 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 = "resolv-conf" version = "0.7.0" @@ -2990,6 +3200,12 @@ dependencies = [ "signature", ] +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + [[package]] name = "rs-release" version = "0.1.9" @@ -3028,15 +3244,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.4.0", - "errno 0.3.3", + "errno 0.3.8", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3076,6 +3292,18 @@ 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", +] + [[package]] name = "ryu" version = "1.0.15" @@ -3153,7 +3381,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3167,15 +3395,6 @@ dependencies = [ "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 = "serde_urlencoded" version = "0.7.1" @@ -3355,6 +3574,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simple-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8542b68b8800c3cda649d2c72d688b6907b30f1580043135d61669d4aad1c175" + [[package]] name = "simple-signal" version = "1.1.1" @@ -3431,12 +3656,6 @@ dependencies = [ "der", ] -[[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.9.3" @@ -3464,6 +3683,22 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "surge-ping" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af341b2be485d647b5dc4cfb2da99efac35b5c95748a08fb7233480fedc5ead3" +dependencies = [ + "hex", + "parking_lot", + "pnet_packet", + "rand 0.8.5", + "socket2 0.5.3", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "syn" version = "1.0.109" @@ -3477,9 +3712,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" dependencies = [ "proc-macro2", "quote", @@ -3533,7 +3768,6 @@ dependencies = [ "bitflags 1.3.2", "chrono", "duct", - "err-derive", "futures", "hickory-proto", "hickory-server", @@ -3549,8 +3783,6 @@ dependencies = [ "once_cell", "parking_lot", "pfctl", - "quickcheck", - "quickcheck_macros", "rand 0.8.5", "resolv-conf", "subslice", @@ -3558,17 +3790,15 @@ dependencies = [ "talpid-dbus", "talpid-openvpn", "talpid-routing", - "talpid-time", "talpid-tunnel", "talpid-tunnel-config-client", "talpid-types", "talpid-windows", "talpid-wireguard", + "thiserror", "tokio", "tonic-build", "triggered", - "trust-dns-proto", - "trust-dns-server", "which", "widestring", "windows-service", @@ -3581,10 +3811,20 @@ name = "talpid-dbus" version = "0.0.0" dependencies = [ "dbus", - "err-derive", "libc", "log", "once_cell", + "thiserror", + "tokio", +] + +[[package]] +name = "talpid-future" +version = "0.0.0" +dependencies = [ + "proptest", + "rand 0.8.5", + "talpid-time", "tokio", ] @@ -3593,7 +3833,6 @@ name = "talpid-openvpn" version = "0.0.0" dependencies = [ "async-trait", - "err-derive", "futures", "log", "once_cell", @@ -3605,6 +3844,7 @@ dependencies = [ "talpid-tunnel", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tonic", "tonic-build", @@ -3620,13 +3860,13 @@ name = "talpid-openvpn-plugin" version = "0.0.0" dependencies = [ "env_logger 0.10.0", - "err-derive", "log", "mullvad-version", "openvpn-plugin", "parity-tokio-ipc", "prost", "talpid-types", + "thiserror", "tokio", "tonic", "tonic-build", @@ -3648,20 +3888,20 @@ dependencies = [ name = "talpid-routing" version = "0.0.0" dependencies = [ - "bitflags 1.3.2", - "err-derive", + "bitflags 2.4.0", "futures", "ipnetwork", "libc", "log", "netlink-packet-route", "netlink-sys", - "nix 0.26.1", + "nix 0.28.0", "once_cell", "rtnetlink", "system-configuration", "talpid-types", "talpid-windows", + "thiserror", "tokio", "widestring", "windows-sys 0.48.0", @@ -3681,7 +3921,6 @@ version = "0.0.0" dependencies = [ "cfg-if", "duct", - "err-derive", "futures", "ipnetwork", "jnix", @@ -3690,6 +3929,7 @@ dependencies = [ "talpid-routing", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tun", "windows-sys 0.48.0", @@ -3719,11 +3959,11 @@ name = "talpid-types" version = "0.0.0" dependencies = [ "base64 0.13.1", - "err-derive", "ipnetwork", "jnix", "log", "serde", + "thiserror", "x25519-dalek", "zeroize", ] @@ -3732,10 +3972,10 @@ dependencies = [ name = "talpid-windows" version = "0.0.0" dependencies = [ - "err-derive", "futures", "socket2 0.5.3", "talpid-types", + "thiserror", "windows-sys 0.48.0", ] @@ -3743,17 +3983,18 @@ dependencies = [ name = "talpid-wireguard" version = "0.0.0" dependencies = [ + "base64 0.13.1", "bitflags 1.3.2", "byteorder", "chrono", "duct", - "err-derive", "futures", "hex", "internet-checksum", "ipnetwork", "libc", "log", + "maybenot", "netlink-packet-core", "netlink-packet-route", "netlink-packet-utils", @@ -3761,15 +4002,18 @@ dependencies = [ "nix 0.23.2", "once_cell", "parking_lot", + "proptest", "rand 0.8.5", "rtnetlink", "socket2 0.5.3", + "surge-ping", "talpid-dbus", "talpid-routing", "talpid-tunnel", "talpid-tunnel-config-client", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tokio-stream", "tunnel-obfuscation", @@ -3802,22 +4046,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3889,7 +4133,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3965,40 +4209,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0a3ab2091e52d7299a39d098e200114a972df0a7724add02a273aa9aada592" -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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "tonic" version = "0.10.0" @@ -4036,7 +4246,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -4092,7 +4302,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -4108,12 +4318,12 @@ dependencies = [ name = "translations-converter" version = "0.0.0" dependencies = [ - "err-derive", "htmlize", "once_cell", "quick-xml", "regex", "serde", + "thiserror", ] [[package]] @@ -4139,7 +4349,6 @@ dependencies = [ "ipnet", "once_cell", "rand 0.8.5", - "serde", "smallvec", "thiserror", "tinyvec", @@ -4162,7 +4371,6 @@ dependencies = [ "parking_lot", "rand 0.8.5", "resolv-conf", - "serde", "smallvec", "thiserror", "tokio", @@ -4170,29 +4378,6 @@ dependencies = [ "trust-dns-proto", ] -[[package]] -name = "trust-dns-server" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2863cefc06d1d5605ea937bfd8939e23687bb44dd5d136217ad9378582f9cc" -dependencies = [ - "async-trait", - "bytes", - "cfg-if", - "drain", - "enum-as-inner", - "futures-executor", - "futures-util", - "serde", - "thiserror", - "time", - "tokio", - "toml 0.7.7", - "tracing", - "trust-dns-proto", - "trust-dns-resolver", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -4215,7 +4400,7 @@ name = "tunnel-obfuscation" version = "0.0.0" dependencies = [ "async-trait", - "err-derive", + "thiserror", "tokio", "udp-over-tcp", ] @@ -4256,6 +4441,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -4333,6 +4524,15 @@ 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.4.0" @@ -4385,7 +4585,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", "wasm-bindgen-shared", ] @@ -4407,7 +4607,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4695,15 +4895,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.50.0" @@ -4730,14 +4921,14 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core 0.6.4", @@ -4745,6 +4936,26 @@ dependencies = [ "zeroize", ] +[[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.51", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -4762,5 +4973,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix index 22ff976829..b1f64da558 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix @@ -17,21 +17,20 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2024.1"; + version = "2024.3"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-syIBYZe+e6i5A6Te51eNKcwwycnRhO1o2tP+z81NYXQ="; + hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk="; - "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg="; + "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index b72e218ddc..91ec4ee9c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-D g15=OFF" + "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 ] ++ (overrides.configureFlags or [ ]); preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix deleted file mode 100644 index 66b5688ddb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, stdenv, lib, nixosTests }: - -let - nodePackages = import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages.n8n.override { - nativeBuildInputs = [ - pkgs.nodePackages.node-pre-gyp - pkgs.which - pkgs.xcbuild - ]; - - buildInputs = [ - pkgs.libkrb5 - pkgs.libmongocrypt - pkgs.postgresql - ]; - - preRebuild = lib.optionalString stdenv.isAarch64 '' - # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. - # This can supposedly be fixed by building a custom copy of the module from source, but that's way - # too much complexity for a setup no one would ever actually run. - # - # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - rm -rf node_modules/oracledb - - # This package tries to load a prebuilt binary for a different arch, and it doesn't provide the binary for aarch64. - # It is marked as an optional dependency in pnpm-lock.yaml and there are no other references to it n8n. - rm -rf node_modules/@sap/hana-client - ''; - - # makes libmongocrypt bindings not look for static libraries in completely wrong places - BUILD_TYPE = "dynamic"; - - # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. - NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; - - dontNpmInstall = true; - - passthru = { - updateScript = ./generate-dependencies.sh; - tests = nixosTests.n8n; - }; - - meta = with lib; { - description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services"; - maintainers = with maintainers; [ freezeboy k900 ]; - license = licenses.sustainableUse; - mainProgram = "n8n"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh b/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh deleted file mode 100755 index 9bc19abe3e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -# --strip-optional-dependencies to get rid of deprecated build deps: -# -# n8n -# -> n8n-nodes-base -# -> ssh2-sftp-client -# -> ssh2 -# -> cpu-features -# -> node-gyp@3.8.0 -> python2 -# -> cmake -cd "$(dirname $(readlink -f $0))" - -node2nix \ - --nodejs-18 \ - --strip-optional-dependencies \ - --node-env node-env.nix \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix deleted file mode 100644 index d9c0daef78..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - 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.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-env.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-env.nix deleted file mode 100644 index bc1e36628a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/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 <> $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 < $out/bin/${scriptName} << EOF #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" + open -na $out/Applications/${appName} --args "\$@" EOF chmod +x $out/bin/${scriptName} runHook postInstall diff --git a/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix b/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix index acfa14dabb..a639c97b96 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.115.0"; + version = "2.117.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-ir96BQQ+dlUv2aNU9iQ+jnpeLE3D3ow9RPGstREUWNA="; + hash = "sha256-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index 433b8855a9..9ad86d99c4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index cb380c8c21..6aa2af7dba 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -24,13 +24,13 @@ }: let - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-M1S5ebdpw11Ot4h4xvbk/rbJxXom2dZ5Of+6eOlBIuE="; + hash = "sha256-LwWdgoVlZjL5o+T8zzU9jkYaQbdiZokrCGn8ZTIQ4OQ="; }; # subpath installation is broken with uvicorn >= 0.26 diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix index 1f6c42eabc..54773afe76 100644 --- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.7"; + version = "8.0.10"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-IBx7P7H2wO6VtqupAvwAwvuDzkm+e2DwWD4UjoDz9KQ="; + sha256 = "sha256-YJx5ygHx0ZYPmw3xFGjPRx8nR20D+XR9SMxE2ymuWes="; name = "${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix index 84cb01832b..d3aa67a47a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -4,12 +4,12 @@ }: let - version = "6.7.9"; + version = "6.8.1"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-UaoIYJxVfQZujf03Swup+zQwb7RWRXuElcswf+MXXQ4="; + hash = "sha256-9t21aIEhLNIY7kSJkcvUVZ8R9/CuW0ZEu8kWkvMMQrM="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index c2a84adc2a..2b9f66dd66 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-20"; + version = "0-unstable-2024-06-23"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "d363b4207281caaa6f3b84af93b0cd56c1855692"; - hash = "sha256-aZIt0DAGDQmIeLZHXjYao5CUhjLp9pjTiXJyoDi0kpQ="; + rev = "91dea2ba714e9b1fb6ab660ddd295653218bdebc"; + hash = "sha256-pn+Ki60lBL+2sKXnhYEly8/Yi94mhiMDxTnWZi4ZFOk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix index aa742bce4f..27d50caedd 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.1"; + version = "7.2.2"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-CK3XkHX16Ec/j1DhC29uoj/YqcLXs/KsIb7v/cfoiaM="; + sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix index b47ba39f0a..7c44bebcb0 100644 --- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 9c131e34bc..00aa166d41 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-nsn/pvlFRDGUnm/X5pyzlKWgP6OlfVn3Mdj6vOJZMWQ="; + hash = "sha256-G+PnzyOG/HZ8I66BHdtK0GOUF7ATrTYpzM9sVaSjMDQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix index 606681b1d6..b6a8ebd2dd 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix @@ -154,6 +154,7 @@ let pythonRuntime = with python.pkgs; [ scipy pyqtgraph + pyqt5 ]; }; gr-analog = { diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index de851c24fa..9d05e1151b 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -156,6 +156,7 @@ let pythonRuntime = with python.pkgs; [ scipy pyqtgraph + pyqt5 ]; }; gr-analog = { diff --git a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index 646f8a9902..70f3da3118 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "multimon-ng"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; rev = version; - sha256 = "sha256-IJnvOVajkcjaa0DDo8hbkkVvBnDqPKQUN8wJHlafo70="; + sha256 = "sha256-irKpVerxzjJIiLofoTdySk/PzojuVLgMq2DYF0qPaAM="; }; buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix index aab629aa7c..d9b03d0573 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.34"; + version = "4.2.35"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PwBQmL6CnDp55eLhXr3vpJXf4DcKAwzFSCnzxt5Nob4="; + sha256 = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index 94758e9b00..4f68ea70b3 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.21.2"; + version = "7.21.3"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-cFSD3zroKJPJk1mhXLnSDoSS6p9AU6YN2LJpb+E6HDI="; + hash = "sha256-TeQteQ+RAnG1J0m4BEYJCrALkfplz3gO5IBi0GxTWmI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix index 569d537172..2f572350ba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; rev = version; - hash = "sha256-njvByA8nbG3qHKfv8eX20TrIhngVI0nzIHmhYIN6htE="; + hash = "sha256-JUMk2XHMOeocSpeeI+k3s9TsEQCdqz3oigTzuwRHbT4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 687c0b3a2d..426a7f18df 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.1"; + version = "24.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-t3eFmiG9X2cmnjc/PQwZ2bw1SCHaNRA83wiT1cPbKJc="; + hash = "sha256-tqyLwlf8hugixZSsFCZPTtchO3VXk3m/nX1kuDoLOAY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix index 41623bf640..50dc0613c7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.5.0.0"; + version = "4.6.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-c3YZsSCjZY75jooiqtc8x/xsWTvYm9labUcOydDlSRQ="; + sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix index 395e5b5dcd..3a7e009cc1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.11.2"; + version = "2.12.2"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-7kZsK3vYgxubgtoIG1dByHgEBOlh9GUq+i3u/1eo0/o="; + sha256 = "sha256-dnvs+niNo8VPuOk9uODezLxdghwutLuhgG5Jyxi8mW0="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix index 56cfa5168a..f30a6725bb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "466"; + version = "467"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-zoDZ+8G0SHKfWmkXBqp+WSjQXtmkcTIZjrjPhUIJw1c="; + hash = "sha256-Y8iHSo70nsPZwVy8ZiiqjU3mGrPOyPQkW0VpLS+ulGE="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 700b2cf3b4..7cfdb674c6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1544"; + version = "1548"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-jxNudfUvSqV1QUzdvG8LWtL977oho9QuOQImmwbQiIM="; + hash = "sha256-6mLPnyEAuRvCeV8pv3avsm6CKDrBPgX8xSxGO2kvTrM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 880ea77e9d..e8786fe4b9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-FcefUf0KwAEEn53XubrB2991ncsCMKicf20fJG6LurQ="; + sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix index 0a81b2a09e..c980e84f9d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-mPRkkKN7Hz9Qi6a3fEwVFh7a9OaBFcksNw9qwNOarao="; + sha256 = "sha256-7syRpCNL7TRZoJaNrmAdahNy7IyovyniYyOwD/lzhuw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index af672d500f..8f0f88461e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -59,6 +59,7 @@ 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="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix index 9f0b87f011..43a00a5e1f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; rev = version; - sha256 = "sha256-T1xDndDnHq/hmhTWWO3Eu0733u8+C8sJMCF6pbLU2GI="; + sha256 = "sha256-EX/boSs6rK4RrJ5W6Rd0TSHsbQsNiFI1evFuNPBMeu8="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index e4fc506516..a27d7c1ffd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; + hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix index 3c4e19d56e..5b56fe7581 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; + hash = "sha256-jlzuLLEFi72ElVBJSRikrMMaHIVWKRUAWGyeqzuj7xw="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index 68134a99a2..0c559a530e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.0.3"; + version = "8.0.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-kkEEJp7NTpHwbo03BGjjJAraFQIJcoNyV+oDsCZlzPQ="; + hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index ded47a661a..5d01a33e5d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.00"; + version = "6.32.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,12 +64,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; + hash = "sha256-PQ92vwWFfhgHzPssngFPUlvLYl+UojcLRV9LFklhYC0="; }; clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; - rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! + # 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.5"; hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; }; @@ -166,7 +168,6 @@ stdenv.mkDerivation rec { "-Dmysql=OFF" "-Dpgsql=OFF" "-Dsqlite=OFF" - "-Dtmva-pymva=OFF" "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" @@ -222,6 +223,9 @@ stdenv.mkDerivation rec { ]}" ''; + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + # To use the debug information on the fly (without installation) # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) # and make sure that gdb from Nixpkgs can be found in PATH. diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bf2fd1dbf3..6531002ceb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -24,7 +24,7 @@ assert enableCuda -> singlePrec; let - inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot; + inherit (cudaPackages.flags) cmakeCudaArchitecturesString; # Select reasonable defaults for all major platforms # The possible values are defined in CMakeLists.txt: @@ -111,10 +111,10 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optionals enableCuda [ "-DGMX_GPU=CUDA" - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: - (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix index a4762323dc..c1de306e6b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.veprbl ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix index fbe5ee56b3..928548e7e7 100644 --- a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doodle"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ libextractor gettext ]; src = fetchurl { url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; - sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; + sha256 = "sha256-qodp2epYyolg38MNhBV+/NMLmfXjhsn2X9uKTUniv2s="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 4be42e9734..3e387f34a7 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -78,7 +78,6 @@ buildPythonApplication rec { changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ - jonringer primeos koral ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix index 47ac58652a..49f0d3040c 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "0-unstable-2024-06-12"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "9589f0dffc817d6e8b86a5b2dc56d7c3db201a9b"; - hash = "sha256-8bZkYFb/HOIg2Uk7b/Apn30AAlRF0ztLh27AUlHW6Wk="; + rev = "522b2bc8631cfe28a1b230d1b774f911eab17cf3"; + hash = "sha256-LYiTp18Qk/rF+n9OuVG4kHDQEbE+ijWKQHA2AIDV4wQ="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 22a7653c6a..28f8c94f57 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.51.0"; + version = "2.52.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xd7IZSOgukEyngxHwsOrHW3ifEMpm1OfXoW3/fvVq3I="; + hash = "sha256-vaB0K9LeMcCcJw5sqxe3bFgzDvhikjAej5vHkvhWqqY="; }; - vendorHash = "sha256-0NKfDSDV/hyQfgkhHe0E9xu7A9hz4JAT5uF/Q2ipEwg="; + vendorHash = "sha256-BnjWpxjkzSZKgeMR5iVdTKomsR93nSQVli4BDsPP4gw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix index f7e6cadac0..bde79f07d6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { homepage = "https://github.com/tcnksm/ghr"; description = "Upload multiple artifacts to GitHub Release in parallel"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "ghr"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix index 0f6db58065..7307988693 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-iTjfFl/bTvyElCIpTj7dsVu3azUSwNTryyssHdCaODg="; + hash = "sha256-JRFd84DR0pLimAslr+LTC2N09sjOuFCXU71hRsEriOs="; }; - cargoHash = "sha256-/Elb/hsk96E7D6TrLgbhD5cQhsXpDigNm5p9FpKGEUQ="; + cargoHash = "sha256-pLbz2z+l8E/R+GffseOacKrjr6ERZf1ETh8tVQjI4TU="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix index f51b999574..870479f11f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-93aayGGMgkSghTpx8M5Cfbxf2szAwrSzuoWK6GCTqZ8="; + hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU="; }; buildInputs = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 366f34e10d..6019e2eb7a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M="; + hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; }; - cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY="; + cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index b806608a5b..c1373346b6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -161,14 +161,16 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/Applications/GitKraken.app + mkdir -p $out/Applications/GitKraken.app $out/bin cp -R . $out/Applications/GitKraken.app + makeWrapper $out/Applications/GitKraken.app/Contents/MacOS/GitKraken $out/bin/gitkraken + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 382038ac99..41fe2756ff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.4", - "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=", + "version": "16.11.5", + "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.4-ee", + "rev": "v16.11.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.4", - "GITLAB_PAGES_VERSION": "16.11.4", + "GITALY_SERVER_VERSION": "16.11.5", + "GITLAB_PAGES_VERSION": "16.11.5", "GITLAB_SHELL_VERSION": "14.35.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.4" + "GITLAB_WORKHORSE_VERSION": "16.11.5" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index fb175aad46..c978c18845 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.4"; + version = "16.11.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,7 +17,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU="; + hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; }; vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 480d9921f9..3cb270e2ca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE="; + hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index d01deb57b2..682376e40a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py index 195fce350c..bb46af27c6 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git import click import click_log @@ -49,19 +49,13 @@ class GitLabRepo: reverse=True, ) return versions - def get_git_hash(self, rev: str): return ( subprocess.check_output( [ - "nix-universal-prefetch", - "fetchFromGitLab", - "--owner", - self.owner, - "--repo", - self.repo, - "--rev", - rev, + "nix-prefetch-url", + "--unpack", + f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz", ] ) .decode("utf-8") diff --git a/third_party/nixpkgs/pkgs/applications/video/flirc/default.nix b/third_party/nixpkgs/pkgs/applications/video/flirc/default.nix index fc73023783..b051bae6b0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/flirc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/flirc/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, wrapQtAppsHook -, hidapi -, readline -, qtsvg -, qtxmlpatterns +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + wrapQtAppsHook, + hidapi, + readline, + qtsvg, + qtxmlpatterns, }: stdenv.mkDerivation { pname = "flirc"; - version = "3.27.10"; + version = "3.27.15"; src = fetchurl { - url = "https://web.archive.org/web/20240110170238/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz"; - hash = "sha256-iTr4vzFQ/+dsbsYD6sc8aTHctTkLKf5HnHBnO7cX5qc="; + url = "https://web.archive.org/web/20240626115121/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz"; + hash = "sha256-8bUsOsp5obJJdZU9QHfJnZKNAXJwi0nrHkSeDTE1Xa4="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ aanderse ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + mainProgram = "Flirc"; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix index 72bdd1f979..1f21fabb78 100644 --- a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.freetube; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index c08aabd25e..0fa023a9fc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchgit , pkg-config , makeWrapper , gtk3 @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "gpu-screen-recorder-gtk"; - version = "3.2.5"; + version = "3.7.6"; - src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r175.cfd18af.tar.gz"; - hash = "sha256-HhZe22Hm9yGoy5WoyuP2+Wj8E3nMs4uf96mzmP6CMqU="; + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; + rev = "cd777c1506e20514df4b97345e480051cbaf9693"; + hash = "sha256-ZBYYsW75tq8TaZp0F4v7YIHKHk/DFBIGy3X781ho2oE="; }; - sourceRoot = "."; nativeBuildInputs = [ pkg-config @@ -46,12 +46,12 @@ stdenv.mkDerivation { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) ''; - meta = with lib; { - description = "GTK frontend for gpu-screen-recorder"; + meta = { + description = "GTK frontend for gpu-screen-recorder."; mainProgram = "gpu-screen-recorder-gtk"; homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ babbaj ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ babbaj ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix index efeff6350c..6ea0ca5c9b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-i21BCkW4WpnQY1j9Wyn3/26GaAjWNXDb+lOVpmXlNKM="; + hash = "sha256-cWqAHC3UYDWk0cL/to9kCdH+SSN3ra+Ni6HTwposNkg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/memento/default.nix b/third_party/nixpkgs/pkgs/applications/video/memento/default.nix index 40ff061a7f..0c993de2fc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/memento/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/memento/default.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, qtx11extras ? null # qt5 only +, qt6 , wrapQtAppsHook # before that => zeal @@ -15,20 +14,15 @@ , yt-dlp # optional , makeWrapper}: - -let - isQt5 = lib.versions.major qtbase.version == "5"; - -in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-55VvT7pHN0/HqxM4vMDQDgUwkVmO/8aOEOye8jcFzgI="; + hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; }; nativeBuildInputs = [ @@ -38,14 +32,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - qtbase + qt6.qtbase + qt6.qtsvg + qt6.qtwayland sqlite json_c libzip mecab - ] ++ lib.optionals isQt5 [ qtx11extras ]; + ]; - propagatedBuildInputs = [ mpv ]; + propagatedBuildInputs = [ mpv ]; preFixup = '' wrapProgram "$out/bin/memento" \ diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index bba0377185..8aaa0cf144 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -8,7 +8,6 @@ , cmark , docbook_xsl , expat -, fetchpatch2 , file , flac , fmt @@ -50,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "84.0"; + version = "85.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; + hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; }; nativeBuildInputs = [ @@ -95,11 +94,6 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ qtwayland ] ++ optionals stdenv.isDarwin [ libiconv ]; - patches = [ (fetchpatch2 { - url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1.patch"; - hash = "sha256-9UZrfwrzfKwF8XDzqYnuaDgZws7l1YAb5O1O1+nxo0g="; - }) ]; - # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' patchShebangs . > /dev/null diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 7b6f98c2b6..c43b823dd7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-nzuPjVwtWGPSNLnWNT4D03j1xZp37HH77t1DnilSQ8E="; + sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index e059412e17..cf88fd3b18 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -61,10 +61,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; - # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer + # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer and + # the wrapper executables. Note that vkcapture and glcapture are themselves + # wrapper scripts that simply exec gamecapture and print a warning but because + # they take gamecapture from PATH, we must link them to the 32 bit gamecapture + # directly. postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' ln -s ${obs-vkcapture32}/share/vulkan/implicit_layer.d/obs_vkcapture_32.json \ "$out/share/vulkan/implicit_layer.d/" + for bin in ${obs-vkcapture32}/bin/* ; do + ln -s ${obs-vkcapture32}/bin/obs-gamecapture "$out/bin/$(basename "$bin")32" + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 5427594b1e..61c6684a2f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.04.28"; + version = "24.06.26"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; + hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index e5f0cac20b..65b8406e8e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.4"; + version = "6.8.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; + hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0="; }; patches = [ @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi - exceptiongroup isodate lxml pycountry diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 9ba769dfd7..d2fda36166 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols +, pkgsCross }: rustPlatform.buildRustPackage rec { @@ -44,7 +45,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "virgl_renderer" ]; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + tests = { + musl = pkgsCross.musl64.crosvm; + }; + }; meta = with lib; { description = "Secure virtual machine monitor for KVM"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index e5ce653f8b..04868b951b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.27.2"; + version = "2.28.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-QwTn/oAfB1bJkPcI0oDGC4vp0xUQxjhF8+jZ+hqpr5Q="; + hash = "sha256-AfWUCgW+aZkedd94uPpfBKKZC1Xvq9wonuCSXGHm774="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-KczMkSwYP9Ng1dYUU7+ig2VRUEOPkaWTV77c9xGqbw0="; + vendorHash = "sha256-MykoU0q2cCnY02a52kyg35L4tJ3KZTzA4usf194Wnbw="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 3d096c3389..939a06d154 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -314,4 +314,18 @@ rec { tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + docker_27 = callPackage dockerGen rec { + version = "27.0.2"; + cliRev = "v${version}"; + cliHash = "sha256-6Occc3jZNS5N76bxLA+WBJuIzF8GJeaXWOMHfFjikIM="; + mobyRev = "v${version}"; + mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU="; + runcRev = "v1.1.13"; + runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + containerdRev = "v1.7.18"; + containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix index f03bdf9631..5b985bb805 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix @@ -47,20 +47,20 @@ let callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.1.3"; + version = "4.1.4"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "refs/tags/v${version}"; - hash = "sha256-pR8zyMr23wcbDCXAysVEgGUDHkrfhLoVF3fjMLgZFYs="; + hash = "sha256-+qwPzgwfF6A1c/rmSM/5T2N9/wVeWhMoAthj3eSQmh8="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-332GFL04aE6B6vxgtJJH4TeI6YJCDBpCClJ3sc5gN3A="; + vendorHash = "sha256-dTqOSk8APLOsqwEiZ/IL8Zu1SR48MyEYPgRe6PC2nd8="; # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix index d927c8430a..d9324d455c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix @@ -6,16 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "stratovirt"; - version = "2.3.0"; + version = "2.4.0"; src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw="; + sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; - patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; - cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts="; + cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch deleted file mode 100644 index 11d2a0e88e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001 -From: Astro -Date: Sun, 18 Jun 2023 23:10:23 +0200 -Subject: [PATCH] micro_vm: allow SYS_clock_gettime - ---- - machine/src/micro_vm/syscall.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs -index c37d3f4e..f9e7cce2 100644 ---- a/machine/src/micro_vm/syscall.rs -+++ b/machine/src/micro_vm/syscall.rs -@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec { - BpfRule::new(libc::SYS_readlink), - BpfRule::new(libc::SYS_getrandom), - BpfRule::new(libc::SYS_fallocate), -+ #[cfg(target_env = "gnu")] -+ BpfRule::new(libc::SYS_clock_gettime), - madvise_rule(), - ] - } --- -2.41.0 - diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index c8bedb1e95..281f451fdd 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -33,6 +33,11 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch"; hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws="; }) + # fix xml test output mismatch + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/8b6db203f726965529567459b302aab1c68c70eb.patch"; + hash = "sha256-FghrSyP4NaTkJhvyqlc2uDNWKaeiylKnaiqkl5Ax6yE="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index dd9b99f7f9..244d123715 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -22,9 +22,6 @@ , extraConfigureFlags ? "" }: -# See https://github.com/cyberus-technology/virtualbox-kvm/issues/12 -assert enableKvm -> !enableHardening; - # The web services use Java infrastructure. assert enableWebService -> javaBindings; @@ -35,8 +32,8 @@ let virtualboxVersion = "7.0.18"; virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; - kvmPatchVersion = "20240515"; - kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0="; + kvmPatchVersion = "20240617"; + kvmPatchHash = "sha256-bOcM9xA1SXB1uTwljpw2vevVeSdHa3omCRon/8DoAUk="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index acb4aa2d32..bd4422cb33 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -7,13 +7,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl${version}"; - hash = "sha256-bRLI+zgfT31LCMW4Pf701ZZx2oFeXoBu1BfYQjX6MPc="; + rev = "refs/tags/hl${version}"; + hash = "sha256-aZuNKBwTwj8EXkDBMWNdRKbHPx647wJLWm55h6jOKbo="; }; nativeBuildInputs = [ cmake ]; @@ -25,6 +25,9 @@ mkHyprlandPlugin hyprland rec { description = "Hyprland plugin for an i3 / sway like manual tiling layout"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ aacebedo ]; + maintainers = with lib.maintainers; [ + aacebedo + johnrtitor + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 8ae5348e99..b3bd59f7b5 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.41.1"; + version = "0.41.2"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "v${version}"; - hash = "sha256-Bw3JRBUZg2kmDwxa/UHvD//gGcNjbftTj2MSeLvx1q8="; + rev = "refs/tags/v${version}"; + hash = "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA="; }; in mkHyprlandPlugin hyprland { @@ -33,7 +33,10 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = with lib.maintainers; [ + fufexan + johnrtitor + ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix index 31101721e4..7b6644d0a9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { license = licenses.mit; platforms = platforms.linux; mainProgram = "swallow"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index e6ed87ffab..ca7eaa587a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; mainProgram = "wayfire"; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index df1b1cfea9..4f1a6769ff 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; mainProgram = "wcm"; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix index 0151ad66f4..b16934e38a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix index 348ef56be5..ce803ba2e8 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/build-support/coq/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/default.nix index 6036d0f05d..e55e22215d 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/default.nix @@ -138,10 +138,9 @@ stdenv.mkDerivation (removeAttrs ({ ''; installPhase = '' runHook preInstall - dune install ${opam-name} --prefix=$out - mv $out/lib/coq $out/lib/TEMPORARY + dune install --prefix=$out --libdir $OCAMLFIND_DESTDIR ${opam-name} mkdir $out/lib/coq/ - mv $out/lib/TEMPORARY $out/lib/coq/${coq.coq-version} + mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} runHook postInstall ''; }) diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix index 9c27a142f4..5f8d1eee8c 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix @@ -56,7 +56,7 @@ in , prepend ? [] # Whether to wrap the initramfs in a u-boot image. -, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage" +, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target or "dummy" == "uImage" # If generating a u-boot image, the architecture to use. The default # guess may not align with u-boot's nomenclature correctly, so it can @@ -75,11 +75,9 @@ let toValidStoreName = x: with builtins; lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); -in stdenvNoCC.mkDerivation rec { +in stdenvNoCC.mkDerivation (rec { inherit name makeUInitrd extension uInitrdArch prepend; - ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; - builder = ./make-initrd.sh; nativeBuildInputs = [ perl libarchive ] @@ -110,4 +108,6 @@ in stdenvNoCC.mkDerivation rec { contents (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; -} +} // lib.optionalAttrs makeUInitrd { + uInitrdCompression = uInitrdCompression; +}) diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 7484b3ad02..3af13fe70a 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,5 +1,5 @@ { lib, stdenv -, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI +, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI, rustc }: { crateName, @@ -27,6 +27,10 @@ # 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' + "-C linker=${rustc.llvmPackages.lld}/bin/lld" + ++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld") + "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; @@ -39,10 +43,7 @@ ++ (map (x: "--crate-type ${x}") crateType) ); - binRustcOpts = lib.concatStringsSep " " ( - [ "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ] ++ - baseRustcOpts - ); + binRustcOpts = lib.concatStringsSep " " baseRustcOpts; build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index dfe28cc334..d6369055cc 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -16,6 +16,16 @@ }: 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. # @@ -77,6 +87,7 @@ let buildCrate = import ./build-crate.nix { inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; + rustc = rustc'; }; installCrate = import ./install-crate.nix { inherit stdenv; }; @@ -274,7 +285,8 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rust stdenv.cc cargo jq ] + nativeBuildInputs = [ rustc' 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_; @@ -380,7 +392,7 @@ crate_: lib.makeOverridable ) ) { - rust = rustc; + rust = rustc'; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix index d020031a92..dd135af919 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -8,6 +8,7 @@ , stdenv , symlinkJoin , writeTextFile +, pkgsCross }: let @@ -120,7 +121,10 @@ let `name` is used as part of the derivation name that performs the checking. - `crateArgs` is passed to `mkHostCrate` to build the crate with `buildRustCrate`. + `mkCrate` can be used to override the `mkCrate` call/implementation to use to + override the `buildRustCrate`, useful for cross compilation. Uses `mkHostCrate` by default. + + `crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate` `expectedFiles` contains a list of expected file paths in the output. E.g. `[ "./bin/my_binary" ]`. @@ -129,13 +133,13 @@ let output is used but e.g. `output = "lib";` will cause the lib output to be checked instead. You do not need to specify any directories. */ - assertOutputs = { name, crateArgs, expectedFiles, output? null }: + assertOutputs = { name, mkCrate ? mkHostCrate, crateArgs, expectedFiles, output? null, }: assert (builtins.isString name); assert (builtins.isAttrs crateArgs); assert (builtins.isList expectedFiles); let - crate = mkHostCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); + crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); crateOutput = if output == null then crate else crate."${output}"; expectedFilesFile = writeTextFile { name = "expected-files-${name}"; @@ -155,7 +159,7 @@ let '' # sed out the hash because it differs per platform + '' - | sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \ + | sed 's/-${crate.metadata}//g' \ > "$actualFiles" diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || { echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2 @@ -651,7 +655,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-HASH.rlib" + "./lib/libtest_lib.rlib" "./lib/link" ]; }; @@ -668,7 +672,24 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-HASH.rlib" + "./lib/libtest_lib.rlib" + "./lib/link" + ]; + }; + + crateLibOutputsWasm32 = assertOutputs { + name = "wasm32-crate-lib"; + output = "lib"; + mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate; + crateArgs = { + libName = "test_lib"; + type = [ "cdylib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/test_lib.wasm" "./lib/link" ]; }; diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh index 14594bcba9..2c63dbfb21 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -68,7 +68,7 @@ linkDLLsInfolder() { markFileAsDone "$file" if [ ! -e "./$file" ]; then local pathsFound - readarray -d '' pathsFound < <(find "${searchPaths[@]}" -name "$file" -type f -print0) + readarray -d '' pathsFound < <(find -L "${searchPaths[@]}" -name "$file" -type f -print0) if [ ${#pathsFound[@]} -eq 0 ]; then continue; fi local dllPath dllPath="${pathsFound[0]}" diff --git a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix index 3d04b9244e..0ca723e85a 100644 --- a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.14.3"; + version = "0.14.9"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-/dKvRr0cH9mLF1y6FGFRDlsFXaymEmb55AZ37Ti0PU4="; + hash = "sha256-JGWkmvcdgkvWDAffInzf2lUFHVjkU/a4m25f8BtQqZc="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix index 62f6630280..b22f8a4151 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -41,13 +41,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.484.0"; + version = "3.3.551.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-zWjV56xw4eVHKx3J2DDq6b+RYjU0EL9ShQmb72SVBVk="; + hash = "sha256-ncdLaHsQAdK1vtFzo55yWicKVfQHxpFpXYpODeG5/9I="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/am/amber-lang/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amber-lang/package.nix index a123027484..1ab8c493ee 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amber-lang/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amber-lang/package.nix @@ -1,36 +1,43 @@ -{ lib, +{ + lib, fetchFromGitHub, rustPlatform, bc, + util-linux, makeWrapper, runCommand, - amber-lang + amber-lang, }: rustPlatform.buildRustPackage rec { pname = "amber-lang"; - version = "0.3.1-alpha"; + version = "0.3.3-alpha"; src = fetchFromGitHub { owner = "Ph0enixKM"; repo = "Amber"; rev = version; - hash = "sha256-VSlLPgoi+KPnUQJEb6m0VZQVs1zkxEnfqs3fAp8m1o4="; + hash = "sha256-Al1zTwQufuVGSlttf02s5uI3cyCNDShhzMT3l9Ctv3Y="; }; - cargoHash = "sha256-NzcyX/1yeFcI80pNxx/OTkaI82qyQFJW8U0vPbqSU7g="; - - buildInputs = [ makeWrapper ]; - - nativeCheckInputs = [ bc ]; + cargoHash = "sha256-HbkIkCVy2YI+nP5t01frXBhlp/rCsB6DwLL53AHJ4vE="; preConfigure = '' substituteInPlace src/compiler.rs \ - --replace-fail "/bin/bash" "bash" + --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")' ''; + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ + bc + # 'rev' in generated bash script of test + # tests::validity::variable_ref_function_invocation + util-linux + ]; + postInstall = '' - wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [bc]}" + wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}" ''; passthru.tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' @@ -43,7 +50,11 @@ rustPlatform.buildRustPackage rec { homepage = "https://amber-lang.com"; license = licenses.gpl3Plus; mainProgram = "amber"; - maintainers = with maintainers; [ cafkafk uncenter ]; + maintainers = with maintainers; [ + cafkafk + uncenter + aleksana + ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index bdf485ac19..379cb80f6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-06-19"; + version = "0-unstable-2024-06-22"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "167915d1c6e4f46932a9857b1a4aeb3e813a8538"; - hash = "sha256-hIrjc80DuuENLbD5MxAku6aY05kdfXWLPSCSssadmr8="; + rev = "049badd3263ed2af20c9e98b062f8c31cf74cec6"; + hash = "sha256-KEFXCaLZL3D7ue4W+MqODg/F633sU8JzDMKM2ebUoD8="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/app.js b/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/app.js new file mode 100644 index 0000000000..4d15eb3a10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/app.js @@ -0,0 +1,14 @@ +const { app, BrowserWindow } = require('electron'); + +app.setName(process.env.ELECTRON_APP_NAME || 'Antimatter Dimensions'); + +app.whenReady().then(() => { + const mainWindow = new BrowserWindow({ + autoHideMenuBar: true, + }); + mainWindow.loadFile('index.html'); +}); + +app.on('window-all-closed', () => { + app.quit(); +}); diff --git a/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/package.nix b/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/package.nix new file mode 100644 index 0000000000..d12c701d35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -0,0 +1,82 @@ +{ buildNpmPackage +, copyDesktopItems +, electron +, fetchFromGitHub +, lib +, makeDesktopItem +, unstableGitUpdater +, writeScriptBin +, electronAppName ? "Antimatter Dimensions" +}: + +let + # build doesn't provide app.js, only index.html as entry point. + # app.js is used to change the directory where data is stored + # instead of default Electron. This workaround will be removed + # when this file will be available in upstream repository. + dummyElectronApp = ./app.js; +in +buildNpmPackage rec { + pname = "antimatter-dimensions"; + version = "0-unstable-2024-06-28"; + src = fetchFromGitHub { + owner = "IvarK"; + repo = "AntimatterDimensionsSourceCode"; + rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5"; + hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E="; + }; + nativeBuildInputs = [ + copyDesktopItems + # build script calls git to get git hash, message and author + # since fetchFromGitHub doesn't provide this information + # and in order to keep determinism (#8567), create a dummy git + (writeScriptBin "git" '' + echo "unknown" + '') + ]; + + npmDepsHash = "sha256-aG+oysgitQvdFM0QyzJ3DBxsanBHYI+UPJPhj6bf00Q="; + npmFlags = [ "--legacy-peer-deps" ]; + npmBuildScript = "build:release"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/antimatter-dimensions + cp -Tr dist $out/share/antimatter-dimensions + mkdir -p $out/share/icons/hicolor/256x256/apps + ln -rs $out/share/antimatter-dimensions/icon.png $out/share/icons/hicolor/256x256/apps/antimatter-dimensions.png + cp ${dummyElectronApp} $out/share/antimatter-dimensions/app.js + + makeWrapper ${lib.getExe electron} $out/bin/antimatter-dimensions \ + --add-flags $out/share/antimatter-dimensions/app.js \ + --set ELECTRON_APP_NAME "${electronAppName}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "antimatter-dimensions"; + exec = "antimatter-dimensions"; + icon = "antimatter-dimensions"; + desktopName = electronAppName; + comment = meta.description; + categories = [ "Game" ]; + terminal = false; + }) + ]; + + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + meta = { + homepage = "https://github.com/IvarK/AntimatterDimensionsSourceCode"; + description = "Idle incremental game with multiple prestige layers."; + license = lib.licenses.mit; + mainProgram = "antimatter-dimensions"; + maintainers = with lib.maintainers; [ amozeo ]; + inherit (electron.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix index dfe9a7eedb..fa00dee192 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix @@ -2,12 +2,12 @@ let pname = "anytype"; - version = "0.40.9"; + version = "0.41.1"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - hash = "sha256-NxiRq/aAWToe27COEoQb4BmyKgLRYQ+gXtM0Djhlcow="; + hash = "sha256-z/Htqq2HgCKNPzF81/nvLK/32KuMUYdHRTQbM8hZSIw="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in appimageTools.wrapType2 { diff --git a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix index 3f5a972fa4..0bd13943ec 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.66.1"; + version = "1.66.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-gaXvkWexvpKOiUEk4OOHla8HmT0sAT94peljH9q9N7c="; + hash = "sha256-W4v+/XTtKE5MLRK8eaI1oz4ZB5K+QlY467WSz+RSaH0="; }; vendorHash = "sha256-czLcy/9QbBuKu3lPISx3Pzf2ccvdp7gF0SWVbSZ6Nn8="; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix index 65a323f684..afcd89b366 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.47.1-50893"; + version = "1.49.0-51346"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-BiEJDs5cHXkmfT9omxG7uk/6zXdOa/69Zn/Y0HqclQc="; + hash = "sha256-XrFDYzRUGCSyM8E+zHK/OZMKWYI9kCxUQ2TI98htPWk="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix index ce4fc7256b..d3eeec5c58 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix @@ -1,106 +1,69 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, callPackage -, cmake -, espeak-ng -, ffmpeg -, file -, freetype -, glib -, gumbo -, harfbuzz -, jbig2dec -, leptonica -, libGL -, libX11 -, libXau -, libXcomposite -, libXdmcp -, libXfixes -, libdrm -, libffi -, libjpeg -, libusb1 -, libuvc -, libvlc -, libvncserver -, libxcb -, libxkbcommon -, makeWrapper -, mesa -, mupdf -, openal -, openjpeg -, pcre2 -, pkg-config -, ruby -, sqlite -, tesseract -, valgrind -, wayland -, wayland-protocols -, xcbutil -, xcbutilwm -, xz -, buildManPages ? true -, useBuiltinLua ? true -, useEspeak ? !stdenv.isDarwin -, useStaticLibuvc ? true -, useStaticOpenAL ? true -, useStaticSqlite ? true -, useTracy ? true +{ + lib, + SDL2, + callPackage, + cmake, + espeak-ng, + ffmpeg, + file, + freetype, + glib, + gumbo, + harfbuzz, + jbig2dec, + leptonica, + libGL, + libX11, + libXau, + libXcomposite, + libXdmcp, + libXfixes, + libdrm, + libffi, + libjpeg, + libusb1, + libuvc, + libvlc, + libvncserver, + libxcb, + libxkbcommon, + makeWrapper, + mesa, + mupdf, + openal, + openjpeg, + pcre2, + pkg-config, + ruby, + sqlite, + stdenv, + tesseract, + valgrind, + wayland, + wayland-protocols, + xcbutil, + xcbutilwm, + xz, + # Boolean flags + buildManPages ? true, + useBuiltinLua ? true, + useEspeak ? !stdenv.isDarwin, + useStaticLibuvc ? true, + useStaticOpenAL ? true, + useStaticSqlite ? true, + useTracy ? true, + # Configurable options + sources ? callPackage ./sources.nix { }, }: -let - allSources = { - letoram-arcan = { - pname = "arcan"; - version = "0.6.2.1-unstable-2023-11-18"; - src = fetchFromGitHub { - owner = "letoram"; - repo = "arcan"; - rev = "0950ee236f96a555729498d0fdf91c16901037f5"; - hash = "sha256-TxadRlidy4KRaQ4HunPO6ISJqm6JwnMRM8y6dX6vqJ4="; - }; - }; - letoram-openal-src = fetchFromGitHub { - owner = "letoram"; - repo = "openal"; - rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; - hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; - }; - libuvc-src = fetchFromGitHub { - owner = "libuvc"; - repo = "libuvc"; - rev = "68d07a00e11d1944e27b7295ee69673239c00b4b"; - hash = "sha256-IdV18mnPTDBODpS1BXl4ulkFyf1PU2ZmuVGNOIdQwzE="; - }; - luajit-src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; - rev = "656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48"; - hash = "sha256-/gGQzHgYuWGqGjgpEl18Rbh3Sx2VP+zLlx4N9/hbYLc="; - }; - tracy-src = fetchFromGitHub { - owner = "wolfpld"; - repo = "tracy"; - rev = "93537dff336e0796b01262e8271e4d63bf39f195"; - hash = "sha256-FNB2zTbwk8hMNmhofz9GMts7dvH9phBRVIdgVjRcyQM="; - }; - }; -in stdenv.mkDerivation (finalAttrs: { - inherit (allSources.letoram-arcan) pname version src; + inherit (sources.letoram-arcan) pname version src; nativeBuildInputs = [ cmake makeWrapper pkg-config - ] ++ lib.optionals buildManPages [ - ruby - ]; + ] ++ lib.optionals buildManPages [ ruby ]; buildInputs = [ SDL2 @@ -140,47 +103,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutil xcbutilwm xz - ] - ++ lib.optionals useEspeak [ - espeak-ng - ]; - - # Emulate external/git/clone.sh - postUnpack = let - inherit (allSources) - letoram-openal-src libuvc-src luajit-src tracy-src; - prepareSource = flag: source: destination: - lib.optionalString flag '' - cp -va ${source}/ ${destination} - chmod --recursive 744 ${destination} - ''; - in - '' - pushd $sourceRoot/external/git/ - '' - + prepareSource useStaticOpenAL letoram-openal-src "openal" - + prepareSource useStaticLibuvc libuvc-src "libuvc" - + prepareSource useBuiltinLua luajit-src "luajit" - + prepareSource useTracy tracy-src "tracy" - + '' - popd - ''; - - postPatch = '' - substituteInPlace ./src/platform/posix/paths.c \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "$out/share" - substituteInPlace ./src/CMakeLists.txt \ - --replace "SETUID" "# SETUID" - ''; - - # INFO: Arcan build scripts require the manpages to be generated *before* the - # `configure` phase - preConfigure = lib.optionalString buildManPages '' - pushd doc - ruby docgen.rb mangen - popd - ''; + ] ++ lib.optionals useEspeak [ espeak-ng ]; cmakeFlags = [ # The upstream project recommends tagging the distribution @@ -195,11 +118,57 @@ stdenv.mkDerivation (finalAttrs: { "../src" ]; - hardeningDisable = [ - "format" - ]; + outputs = [ "out" "dev" "lib" "man" ]; + + hardeningDisable = [ "format" ]; + + strictDeps = true; + + # Emulate external/git/clone.sh + postUnpack = + let + inherit (sources) + letoram-openal + libuvc + luajit + tracy + ; + prepareSource = + flag: source: destination: + lib.optionalString flag '' + cp -va ${source}/ ${destination} + chmod --recursive 744 ${destination} + ''; + in + '' + pushd $sourceRoot/external/git/ + '' + + prepareSource useStaticOpenAL letoram-openal.src "openal" + + prepareSource useStaticLibuvc libuvc.src "libuvc" + + prepareSource useBuiltinLua luajit.src "luajit" + + prepareSource useTracy tracy.src "tracy" + + '' + popd + ''; + + postPatch = '' + substituteInPlace ./src/platform/posix/paths.c \ + --replace-fail "/usr/bin" "$out/bin" \ + --replace-fail "/usr/share" "$out/share" + substituteInPlace ./src/CMakeLists.txt \ + --replace-fail "SETUID" "# SETUID" + ''; + + # INFO: Arcan build scripts require the manpages to be generated *before* the + # `configure` phase + preConfigure = lib.optionalString buildManPages '' + pushd doc + ruby docgen.rb mangen + popd + ''; passthru = { + inherit sources; wrapper = callPackage ./wrapper.nix { }; }; @@ -212,7 +181,11 @@ stdenv.mkDerivation (finalAttrs: { e.g. game development, real-time streaming video, monitoring and surveillance, up to and including desktop compositors and window managers. ''; - license = with lib.licenses; [ bsd3 gpl2Plus lgpl2Plus ]; + license = with lib.licenses; [ + bsd3 + gpl2Plus + lgpl2Plus + ]; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix b/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix new file mode 100644 index 0000000000..6701021eb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/sources.nix @@ -0,0 +1,80 @@ +{ + fetchFromGitHub, +}: + +{ + letoram-arcan = let + self = { + pname = "arcan"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "letoram"; + repo = "arcan"; + rev = self.version; + hash = "sha256-ZSKOkNrFa2QgmXmmXnLkB1pehmVJbEFVeNs43Z2DSKo="; + }; + }; + in + self; + + letoram-openal = { + pname = "letoram-openal"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "letoram"; + repo = "openal"; + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; + hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; + }; + }; + + libuvc = { + pname = "libuvc"; + version = "0.0.7-unstable-2024-03-05"; + + src = fetchFromGitHub { + owner = "libuvc"; + repo = "libuvc"; + rev = "047920bcdfb1dac42424c90de5cc77dfc9fba04d"; + hash = "sha256-Ds4N9ezdO44eBszushQVvK0SUVDwxGkUty386VGqbT0="; + }; + }; + + luajit = { + pname = "luajit"; + version = "2.1-unstable-2024-04-19"; + + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = "9b5e837ac2dfdc0638830c048a47ca9378c504d3"; + hash = "sha256-GflF/sELSNanc9G4WMzoOadUBOFSs6OwqhAXa4sudWA="; + }; + }; + + tracy = { + pname = "tracy"; + version = "0.9.1-unstable-2023-10-09"; + + src = fetchFromGitHub { + owner = "wolfpld"; + repo = "tracy"; + rev = "93537dff336e0796b01262e8271e4d63bf39f195"; + hash = "sha256-FNB2zTbwk8hMNmhofz9GMts7dvH9phBRVIdgVjRcyQM="; + }; + }; + + letoram-tracy = { + pname = "letoram-tracy"; + version = "0-unstable-2024-04-12"; + + src = fetchFromGitHub { + owner = "letoram"; + repo = "tracy"; + rev = "5b3513d9838317bfc0e72344b94aa4443943c2fd"; + hash = "sha256-hUdYC4ziQ7V7T7k99MERp81F5mPHzFtPFrqReWsTjOQ="; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix b/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix index e5ffcc27b2..644ef2e284 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; + hash = "sha256-kNPmtaUb5rMbdTlNKD3PrInuxGQt/JamMDx8BwBxVd8="; }; - cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; + cargoHash = "sha256-iV2GXH7opNIyWsgi0EnRIXDhJd3s66qFhnZWawBPb6g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix index 9142c0dad9..a4223aa3a0 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix @@ -4,10 +4,10 @@ , lib , makeDesktopItem , makeWrapper -, stdenv +, stdenvNoCC -, gamemodeSupport ? stdenv.isLinux -, textToSpeechSupport ? stdenv.isLinux +, gamemodeSupport ? stdenvNoCC.isLinux +, textToSpeechSupport ? stdenvNoCC.isLinux , additionalLibs ? [ ] , # dependencies @@ -19,7 +19,7 @@ , xorg }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; version = "3.4.36.9"; diff --git a/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.json b/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.json new file mode 100644 index 0000000000..573119c376 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.json @@ -0,0 +1,100 @@ +{ + "name": "auto-changelog", + "version": "2.4.0", + "description": "Command line tool for generating a changelog from git tags and commit history", + "main": "./src/index.js", + "bin": { + "auto-changelog": "./src/index.js" + }, + "engines": { + "node": ">=8.3" + }, + "scripts": { + "lint": "standard --verbose | snazzy", + "lint-fix": "standard --fix", + "lint-markdown": "markdownlint README.md test/data/*.md", + "test": "cross-env NODE_ENV=test mocha -r @babel/register test", + "test-coverage": "cross-env NODE_ENV=test nyc mocha test", + "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", + "preversion": "npm run lint && npm run test", + "version": "node src/index.js --package && git add CHANGELOG.md", + "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js" + }, + "author": "Pete Cook (https://github.com/cookpete)", + "homepage": "https://github.com/CookPete/auto-changelog", + "repository": { + "type": "git", + "url": "https://github.com/CookPete/auto-changelog.git" + }, + "bugs": { + "url": "https://github.com/CookPete/auto-changelog/issues" + }, + "keywords": [ + "auto", + "automatic", + "changelog", + "change", + "log", + "generator", + "git", + "commit", + "commits", + "history" + ], + "license": "MIT", + "dependencies": { + "commander": "^7.2.0", + "handlebars": "^4.7.7", + "node-fetch": "^2.6.1", + "parse-github-url": "^1.0.2", + "semver": "^7.3.5" + }, + "devDependencies": { + "@babel/core": "^7.14.3", + "@babel/register": "^7.13.16", + "babel-plugin-istanbul": "^6.0.0", + "babel-plugin-rewire": "^1.2.0", + "chai": "^4.3.4", + "codecov": "^3.8.2", + "cross-env": "^7.0.3", + "markdownlint-cli": "^0.30.0", + "mocha": "^9.2.0", + "nyc": "^15.1.0", + "snazzy": "^9.0.0", + "standard": "^16.0.3" + }, + "babel": { + "env": { + "test": { + "plugins": [ + "istanbul", + "rewire" + ] + } + } + }, + "standard": { + "ignore": [ + "test/data/" + ] + }, + "nyc": { + "all": true, + "include": "src", + "exclude": "src/index.js", + "sourceMap": false, + "instrument": false, + "report-dir": "./coverage", + "temp-dir": "./coverage/.nyc_output", + "require": [ + "@babel/register" + ], + "reporter": [ + "text", + "html" + ] + }, + "auto-changelog": { + "breakingPattern": "Breaking change" + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.nix b/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.nix new file mode 100644 index 0000000000..44a4273b90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/au/auto-changelog/package.nix @@ -0,0 +1,31 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub +}: mkYarnPackage rec { + pname = "auto-changelog"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "cookpete"; + repo = "auto-changelog"; + rev = "v${version}"; + hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; + }; + + meta = { + description = "Command line tool for generating a changelog from git tags and commit history"; + homepage = "https://github.com/cookpete/auto-changelog"; + changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "auto-changelog"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix b/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix new file mode 100644 index 0000000000..8f70c247fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/az/azurite/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, stdenv +, darwin +, libsecret +, pkg-config +, python3 +}: + +buildNpmPackage rec { + pname = "azurite"; + version = "3.31.0"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "Azurite"; + rev = "v${version}"; + hash = "sha256-WT1eprN6SBnsfITCopybEHCuxrHvKEhdmVs7xL3cUi0="; + }; + + npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE="; + + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = lib.optionals stdenv.isLinux [ + libsecret + ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + Security + apple_sdk.frameworks.AppKit + ]); + + meta = { + description = "An open source Azure Storage API compatible server"; + homepage = "https://github.com/Azure/Azurite"; + changelog = "https://github.com/Azure/Azurite/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ danielalvsaaker ]; + mainProgram = "azurite"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ba/babeltrace/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/babeltrace/package.nix index 2d995df59c..a9a9928d77 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/babeltrace/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/babeltrace/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.efficios.com/babeltrace.git"; rev-prefix = "v"; # Versions 2.x are packaged independently as babeltrace2 - ignoredVersions = "^[^1]"; + allowedVersions = "^1\\."; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix index d591250ba2..d300a1edf6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix @@ -1,19 +1,23 @@ { lib, - buildNpmPackage, fetchFromGitHub, runCommand, jq, + buildNpmPackage, + python3, + stdenvNoCC, + testers, + basedpyright, }: let - version = "1.12.6"; + version = "1.13.1"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-1F3T+BGamFJEDAIMz684oIn4xEDbNadEh8TTG5l8fPo="; + hash = "sha256-dIIYHVsDSNwhedWlPnLCvB5aGgVukGLs5K84WHqQyVM="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -43,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-8nXW5Z5xTr8EXxyBylxCr7C88zmRxppe8EaspFy7b6o="; + npmDepsHash = "sha256-OZHCAJd/O6u1LhkJZ/TK9L8s4bcXMMNVlKF3If+Ms1A="; dontNpmBuild = true; # FIXME: Remove this flag when TypeScript 5.5 is released npmFlags = [ "--legacy-peer-deps" ]; @@ -53,16 +57,49 @@ let runHook postInstall ''; }; + + 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 ]; + + installPhase = '' + runHook preInstall + cp -r packages/pyright-internal/typeshed-fallback docstubs + ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + cp -rv docstubs "$out" + runHook postInstall + ''; + }; in buildNpmPackage rec { pname = "basedpyright"; inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ZFuCY2gveimFK5Hztj6k6PkeTpbR7XiyQyS5wPaNNts="; + npmDepsHash = "sha256-wjwF1OlR9ohrl8gWW7ctVpeCq2Fu2m1XdHOEkXt7zjA="; postPatch = '' chmod +w ../../ + mkdir ../../docstubs + ln -s ${docstubs}/stubs ../../docstubs ln -s ${pyright-root}/node_modules ../../node_modules chmod +w ../pyright-internal ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules @@ -75,7 +112,10 @@ buildNpmPackage rec { dontNpmBuild = true; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = basedpyright; }; + }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/by-name/bc/bcachefs-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcachefs-tools/package.nix index 14f668bf5b..f6f06296ac 100644 --- a/third_party/nixpkgs/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -21,6 +21,7 @@ makeWrapper, nix-update-script, python3, + fetchpatch, fuseSupport ? false, }: @@ -71,6 +72,11 @@ stdenv.mkDerivation (finalAttrs: { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ] ++ lib.optional fuseSupport "BCACHEFS_FUSE=1"; + env = { + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; + }; + # FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder @@ -78,8 +84,19 @@ stdenv.mkDerivation (finalAttrs: { # code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 ./fix-encrypted-boot.patch + # https://github.com/koverstreet/bcachefs-tools/pull/305 + (fetchpatch { + name = "use-ar-var-in-makefile.patch"; + url = "https://github.com/koverstreet/bcachefs-tools/commit/91e67ab2bd48fa135a1f5109b23899a4f1019a03.patch"; + sha256 = "sha256-nB4Tgcwa8eeasIDQ4rrYORie/X8LMuCSRi+WJNw+R/U="; + }) ]; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs" + ''; + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; diff --git a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix index e8637a0e3a..c36564b9af 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.6.0"; + version = "4.6.2"; plat = { aarch64-linux = "-arm64"; @@ -16,7 +16,7 @@ let hash = { aarch64-linux = "sha256-ZxqwxCON21S+RPG0/M2TtcI2Ave7ZT05lKQdyysQFUk="; - x86_64-linux = "sha256-y4Muap7X4YyeIftRGC+NrDt3wjqOPi1lt+tsHhKmx4M="; + x86_64-linux = "sha256-8sGFNoAsX+X3IJDXpwlYRt78nokauPYz88yDEYy6NP8="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix b/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix index 60dfb62567..e91299ae97 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bevelbar"; - version = "23.08"; + version = "24.06"; src = fetchurl { url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz"; - hash = "sha256-4wMSPi9tu+z1AW2uvPefxkeT/5DYo2oJybhNnpe82QU="; + hash = "sha256-A7nrpMty4uxbiLzW83cmxlhQh8et1qo/n0mwBXNLJOc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix index e410e92f8d..b3f7a7b7ad 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.5-2"; + 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-4p5izaQsax4i2/AnjivDVoY205ITmEx48GhblPOZDjk="; + hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/bi/binary/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/binary/package.nix new file mode 100644 index 0000000000..1a908e5265 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bi/binary/package.nix @@ -0,0 +1,55 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + appstream, + desktop-file-utils, + glib, + gobject-introspection, + libadwaita, + meson, + ninja, + pkg-config, + wrapGAppsHook4, +}: + +python3Packages.buildPythonApplication rec { + pname = "binary"; + version = "0.3"; + format = "other"; + + src = fetchFromGitHub { + owner = "fizzyizzy05"; + repo = "binary"; + rev = "refs/tags/${version}"; + hash = "sha256-bR0oCqbnyUTCueT4f0Ij7qbwjNnN4eMDAOUK9MnCEJ0="; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + glib # need glib-compile-schemas + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ pygobject3 ]; + + dontWrapGApps = true; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + meta = { + description = "Small and simple app to convert numbers to a different base"; + homepage = "https://github.com/fizzyizzy05/binary"; + changelog = "https://github.com/fizzyizzy05/binary/releases/tag/${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "binary"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix new file mode 100644 index 0000000000..6cc7e97c7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bl/blastem/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchhg, + pkg-config, + makeBinaryWrapper, + SDL2, + glew, + gtk3, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blastem"; + version = "0.6.2-unstable-2024-03-31"; + + src = fetchhg { + url = "https://www.retrodev.com/repos/blastem"; + rev = "48ab1e3e5df5"; + hash = "sha256-UZl5fIE7LJqxwS8kFJ3xr8BJyHF60dnRNeA5k7lAuxg="; + }; + + # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481 + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-flto" "" + ''; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; + + buildInputs = [ + gtk3 + SDL2 + glew + ]; + + # Note: menu.bin cannot be generated yet, because it would + # need the `vasmm68k_mot` executable (part of vbcc for amigaos68k + # Luckily, menu.bin doesn't need to be present for the emulator to function + + makeFlags = [ "HOST_ZLIB=1" ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + + installPhase = '' + runHook preInstall + + # not sure if any executable other than blastem is really needed here + install -Dm755 blastem dis zdis termhelper -t $out/share/blastem + install -Dm644 gamecontrollerdb.txt default.cfg rom.db -t $out/share/blastem + cp -r shaders $out/share/blastem/shaders + + # wrapping instead of sym-linking makes sure argv0 stays at the original location + makeWrapper $out/share/blastem/blastem $out/bin/blastem + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "blastem -v"; + version = "0.6.3-pre"; # remove line when moving to a stable version + }; + + meta = { + description = "The fast and accurate Genesis emulator"; + homepage = "https://www.retrodev.com/blastem/"; + license = lib.licenses.gpl3Plus; + mainProgram = "blastem"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ + "i686-linux" + "x86_64-linux" + "x86_64-darwin" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/bm/bmake/package.nix b/third_party/nixpkgs/pkgs/by-name/bm/bmake/package.nix index 6eebe5fb5d..6a13dcd0cf 100644 --- a/third_party/nixpkgs/pkgs/by-name/bm/bmake/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240520"; + version = "20240625"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-IhDM1FWwCN95Ufbb00e/zBg3xGRzAU5LjdX/MJGuKJQ="; + hash = "sha256-tcBsLyiWtOTZtERLFV3IWxXJDkAlPsw4iakspFevcWQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix new file mode 100644 index 0000000000..381fcd1617 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, clangStdenv +, gtk3 +, xorg +, perl +, openssl +, speechd +, libxkbcommon +, libGL +, wayland +}: +let + rpathLibs = [ + speechd + openssl + gtk3 + libxkbcommon + libGL + + # WINIT_UNIX_BACKEND=wayland + wayland + + # WINIT_UNIX_BACKEND=x11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libX11 + xorg.libxcb + ]; +in +rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { + pname = "BoilR"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "PhilipK"; + repo = "BoilR"; + rev = "v.${version}"; + hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; + }; + + cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM="; + + nativeBuildInputs = [ perl ]; + + buildInputs = rpathLibs; + + postInstall = '' + patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/boilr + install -Dpm 0644 flatpak/io.github.philipk.boilr.desktop $out/share/applications/boilr.desktop + install -Dpm 0644 resources/io.github.philipk.boilr.png $out/share/pixmaps/io.github.philipk.boilr.png + ''; + + dontPatchELF = true; + + meta = { + 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 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ foolnotion ]; + mainProgram = "boilr"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix index b5417bdf74..8c3bba62e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix @@ -23,7 +23,7 @@ let { x86_64-linux = { name = "BombSquad_Linux_x86_64"; - hash = "sha256-YrbDhdVtNtxeE3fIRPIODwVO3lrxz7OAAYc7doBBQj8="; + hash = "sha256-XSt6YvBZba/0fO85aJpg1vJnr5tLQsKVuqxSKOrMXw8="; }; aarch-64-linux = { name = "BombSquad_Linux_Arm64"; @@ -34,7 +34,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bombsquad"; - version = "1.7.35"; + version = "1.7.36"; sourceRoot = "."; src = fetchurl { url = "https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix b/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix index 247859ccf8..60e2bce7c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVHz6Zwl4WOgwCYXtGfNJBmlnJUAWfe+NAkgnG/QC8A="; + sha256 = "sha256-GS3R1qqL9h7kVQQXl0GBsdWUI8rwtJvRW4Cfqp+VYNU="; }; - cargoHash = "sha256-+flZXxdN5mcmxMZeIV4J4wc+mYuGf5LuGAw4Kz/faak="; + cargoHash = "sha256-sdlHCPqLsgM1XG3lNfy+ET1xKCKVcdtRcvShxpBW8MQ="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/canard/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/canard/package.nix new file mode 100644 index 0000000000..8883d0781e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/canard/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "canard"; + version = "0.0.2-unstable-2024-04-22"; + + src = fetchFromGitHub { + owner = "mrusme"; + repo = "canard"; + rev = "d3c37d11078574ca16b75475b3d08ffe351bc3c2"; + hash = "sha256-ICrTEaTYFAViORWvdj4uW2gLgxtWxRlhgu5sifgqGX0="; + }; + + vendorHash = "sha256-qcfPW7rz0v63QmQQceQltkCFNBUeQTxVerxDymv7SZo="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mrusme/canard/main.VERSION=${version}" + ]; + + meta = { + description = "Command line TUI client for the journalist RSS aggregator"; + homepage = "https://github.com/mrusme/canard"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "canard"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-swift/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-swift/package.nix index 1cdfb0f464..18b2cecbd5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-swift/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-hTlgIPXXdhxFtK/acXITwitIg1DGgF4cCVaAxogWPrk="; + hash = "sha256-2jKu1Hl+2HnlZWu+mLmrhrhzH1Q/S9ej+SJyjeMr4CI="; }; - cargoHash = "sha256-6F4CX9uiCfPbgFRZ0hC/s5xT42S2V5ZgGQ+O2bHb9vg="; + cargoHash = "sha256-PQkV2Gz1whIM772bGAEC0TQO9w4DaWSrtCejgVCFTpA="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix index 3674d61faf..eeb20dbfda 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix @@ -1,66 +1,61 @@ -{ blueprint-compiler -, desktop-file-utils -, fetchFromGitHub -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3Packages -, stdenv -, wrapGAppsHook4 -, nix-update-script +{ + lib, + fetchFromGitHub, + python3Packages, + appstream, + blueprint-compiler, + desktop-file-utils, + gobject-introspection, + glib-networking, + libadwaita, + meson, + ninja, + pkg-config, + wrapGAppsHook4, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication rec { pname = "cartridges"; version = "2.8.5"; + pyproject = false; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; - rev = "v${finalAttrs.version}"; + rev = "v${version}"; hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; }; - pythonPath = with python3Packages; [ + # TODO: remove this when #286814 hits master + mesonFlags = [ "-Dtiff_compression=jpeg" ]; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib-networking + libadwaita + ]; + + dependencies = with python3Packages; [ pillow pygobject3 pyyaml requests ]; - # TODO: remove this when #286814 hits master - mesonFlags = [ "-Dtiff_compression=jpeg" ]; - - buildInputs = [ - libadwaita - (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) - ]; - - nativeBuildInputs = [ - blueprint-compiler - desktop-file-utils - gobject-introspection - meson - ninja - python3Packages.wrapPython - wrapGAppsHook4 - ]; - dontWrapGApps = true; + makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ]; - postFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonPrograms "$out/bin" "$out" "$pythonPath" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { + meta = { description = "GTK4 + Libadwaita game launcher"; - mainProgram = "cartridges"; longDescription = '' A simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic @@ -68,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: { You can sort and hide games or download cover art from SteamGridDB. ''; homepage = "https://apps.gnome.org/Cartridges/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "cartridges"; + platforms = lib.platforms.linux; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/castero/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/castero/package.nix index 0b9f727dda..fad593853a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/castero/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/castero/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "test_datafile_download" ]; - pythonImportCheck = [ + pythonImportsCheck = [ "castero" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cat9/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cat9/package.nix index 8cee41e62f..011450c025 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cat9/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cat9/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + fetchFromGitHub, + stdenvNoCC, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; - version = "unstable-2023-11-06"; + version = "0-unstable-2024-06-17"; src = fetchFromGitHub { owner = "letoram"; repo = "cat9"; - rev = "a807776a85237ab0bdd0a712fb33c176fc295e30"; - hash = "sha256-OlH8FgVBk76Qw+5mnsrryXOL9GbPJWlwUGtYlLuAPxQ="; + rev = "f00e8791c1826065d4a93ace12e55ab5732d17a7"; + hash = "sha256-xFw6r7SQK0T5j7hVK3U39U2Q/qZow6Ad/R0Cl6nqUQw="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix index d75f6d994b..1535dc0bfd 100644 --- a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "17.0"; + version = "17.0.1"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY="; + hash = "sha256-hzsTtUlxyG5dKmKZKR9lxPHczI0jd06d1RGvb9crbyE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix index a3491af59f..4b8743c909 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "celluloid"; - version = "0.26"; + version = "0.27"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${finalAttrs.version}"; - hash = "sha256-npaagLlkwDe0r0hqj7buM4B9sbLCX1sR2yFXXj+obdE="; + hash = "sha256-zuYt7taIb4w3NIszUpnSYvLIdYQH492tBwhLa6IgWDw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix index 15910d3655..82601a7fba 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-sSEainZXgZ26u4J0FXVM8Je1uwDrAOkzLMgrCUtOx74="; + hash = "sha256-rIsc+abyfhHncogxZnx7Dmvc/JRm+L4YKZOOW/Qtddg="; }; - vendorHash = "sha256-kPnkuBOcTDuAWD51JGJvgHLj9jn9kHZOfPw/DF64Mn8="; + vendorHash = "sha256-+fZnoDH5nbzrGWrr8ayBqzJoAji6y+CYI+TvEISxPRs="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chow-kick/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chow-kick/package.nix index b9dec059d1..4998d2d38a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chow-kick/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chow-kick/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chow-kick"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; repo = "ChowKick"; rev = "v${finalAttrs.version}"; - sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + sha256 = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix index 40b1a4d3c4..96383fdd66 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix @@ -1,18 +1,20 @@ -{ lib, appimageTools, fetchurl }: +{ + lib, + appimageTools, + fetchurl, +}: let pname = "chrysalis"; version = "0.13.3"; - name = "${pname}-${version}-binary"; src = fetchurl { - url = - "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; - hash = - "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; + url = "https://github.com/keyboardio/chrysalis/releases/download/v${version}/chrysalis-${version}-x64.AppImage"; + hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name pname src; + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; extraPkgs = pkgs: [ pkgs.glib ]; @@ -30,7 +32,7 @@ in appimageTools.wrapType2 rec { -t $out/share/applications substituteInPlace \ $out/share/applications/Chrysalis.desktop \ - --replace 'Exec=Chrysalis' 'Exec=${pname}' + --replace-fail 'Exec=Chrysalis' 'Exec=${pname}' install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; @@ -40,9 +42,15 @@ in appimageTools.wrapType2 rec { meta = with lib; { description = "Graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aw eclairevoyant nshalman ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + aw + eclairevoyant + nshalman + ]; platforms = [ "x86_64-linux" ]; - mainProgram = "chrysalis"; + # buildFHSEnv will create a symlink in $out/bin/${pname} + mainProgram = pname; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/update.sh b/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/update.sh old mode 100644 new mode 100755 diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cinzel/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cinzel/package.nix new file mode 100644 index 0000000000..21e22474a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ci/cinzel/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenvNoCC, fetchFromGitHub, rename, nix-update-script }: + +stdenvNoCC.mkDerivation { + pname = "cinzel"; + version = "0-unstable-2020-07-22"; + + src = fetchFromGitHub { + owner = "NDISCOVER"; + repo = "Cinzel"; + rev = "dd598495b0fb2ad84270d5cc75d642d2f1e8eabf"; + hash = "sha256-V3vSxe5eHN0BUplzmmBchzuV+gz36WfgZZezJ6NfaWg="; + }; + + outputs = [ "out" "variable" ]; + + nativeBuildInputs = [ rename ]; + + installPhase = '' + runHook preInstall + + rename 's/\[wght\]//g' "" fonts/variable/* + install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype + install -Dm644 fonts/variable/*.ttf -t $variable/share/fonts/truetype + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + homepage = "https://github.com/NDISCOVER/Cinzel"; + description = "Typeface inspired in First Century Roman Inscriptions"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.marijanp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix index b09b83d169..03a42f586f 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-pL6BWfRkyOzi7TnMAEcHyrUDVpK9IOeqcfRKfkHtWmw="; + hash = "sha256-x+Xkasg6Yzft5CLg2YFCRkgpDeiVvvdmcLjrg+oIOT8="; }; meta = old.meta // (with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clever-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clever-tools/package.nix new file mode 100644 index 0000000000..056bf1b594 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/clever-tools/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nodejs_18 +, installShellFiles +}: + +buildNpmPackage rec { + pname = "clever-tools"; + + version = "3.7.0"; + + nodejs = nodejs_18; + + src = fetchFromGitHub { + owner = "CleverCloud"; + repo = "clever-tools"; + rev = version; + hash = "sha256-Ce7lk+zTbyj3HmtIFui9ZA1FThZEytovrPCrmjMyX38="; + }; + + npmDepsHash = "sha256-VQXljlIHAE2o10cXQlsyhTvBSp3/ycQOJydQGNMiWuk="; + + dontNpmBuild = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd clever \ + --bash <($out/bin/clever --bash-autocomplete-script) \ + --zsh <($out/bin/clever --zsh-autocomplete-script) + rm $out/bin/install-clever-completion + rm $out/bin/uninstall-clever-completion + ''; + + meta = with lib; { + homepage = "https://github.com/CleverCloud/clever-tools"; + changelog = "https://github.com/CleverCloud/clever-tools/blob/${version}/CHANGELOG.md"; + description = "Deploy on Clever Cloud and control your applications, add-ons, services from command line"; + license = licenses.asl20; + mainProgram = "clever"; + maintainers = teams.clevercloud.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix new file mode 100644 index 0000000000..28ead1ee69 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/clickable/package.nix @@ -0,0 +1,87 @@ +{ + lib, + fetchFromGitLab, + gitUpdater, + python3Packages, + stdenv, +}: + +python3Packages.buildPythonApplication rec { + pname = "clickable"; + version = "8.2.0"; + + src = fetchFromGitLab { + owner = "clickable"; + repo = "clickable"; + rev = "v${version}"; + sha256 = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0="; + }; + + propagatedBuildInputs = with python3Packages; [ + cookiecutter + requests + pyyaml + jsonschema + argcomplete + watchdog + ]; + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + + disabledTests = + [ + # Tests require docker + "test_cpp_plugin" + "test_html" + "test_python" + "test_qml_only" + "test_rust" + "test_review" + "test_click_build" + "test_no_device" + "test_no_file_temp" + "test_update" + "test_lib_build" + "test_clean" + "test_temp_exception" + "test_create_interactive" + "test_create_non_interactive" + "test_kill" + "test_writable_image" + "test_no_desktop_mode" + "test_no_lock" + "test_run_default_command" + "test_run" + "test_no_container_mode_log" + "test_custom_mode_log" + "test_skip_desktop_mode" + "test_log" + "test_custom_lock_file" + "test_launch_custom" + "test_launch" + "test_devices" + "test_install" + "test_skip_container_mode" + "test_godot_plugin" + ] + ++ + # There are no docker images available for the aarch64 architecutre + # which are required for tests. + lib.optionals stdenv.isAarch64 [ + "test_arch" + "test_restricted_arch" + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Build system for Ubuntu Touch apps"; + mainProgram = "clickable"; + homepage = "https://clickable-ut.dev"; + changelog = "https://clickable-ut.dev/en/latest/changelog.html#changes-in-v${ + lib.strings.replaceStrings [ "." ] [ "-" ] version + }"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members ++ (with lib.maintainers; [ ilyakooo0 ]); + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix index da6118d901..b72baf6e46 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-i+5hUwarJHa3QzHPqJ0N/gztKWoRCKXsEbX3Q/1PQ9Q="; + hash = "sha256-rftAGrquvNPRu49rDUaPVO7EUMCvcLoV0w801BBOG8c="; }; - cargoHash = "sha256-lPH2v+OfO/NCLdAVvPbIgAeVAOWHjhNIOap94p0+NR0="; + cargoHash = "sha256-Amm/NnJSnqB5q+bxRJ5A6GKOFhIGTq1OSXESF5r22bI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clippy-sarif/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clippy-sarif/package.nix new file mode 100644 index 0000000000..551530dcc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/clippy-sarif/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + clippy, + clippy-sarif, + testers, +}: +rustPlatform.buildRustPackage rec { + pname = "clippy-sarif"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "psastras"; + repo = "sarif-rs"; + rev = "clippy-sarif-v${version}"; + hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno="; + }; + + cargoHash = "sha256-F3NrqkqLdvMRIuozCMMqwlrrf5QrnmcEhy4TGSzPhiU="; + cargoBuildFlags = [ + "--package" + "clippy-sarif" + ]; + cargoTestFlags = cargoBuildFlags; + + passthru = { + tests.version = testers.testVersion { package = clippy-sarif; }; + }; + + meta = { + description = "A CLI tool to convert clippy diagnostics into SARIF"; + mainProgram = "clippy-sarif"; + homepage = "https://psastras.github.io/sarif-rs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + inherit (clippy.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-utils/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-utils/package.nix new file mode 100644 index 0000000000..40e98dcedf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "cloudflare-utils"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Cyb3r-Jak3"; + repo = "cloudflare-utils"; + rev = "v${version}"; + sha256 = "sha256-41TQ+St6U4exLSl4dwc1E6K8P+oqQ4m5RSI7L2/dWwI="; + }; + + vendorHash = "sha256-HE6x4KSe9b9ZzcYz7sP25aTeDGU4zXgkYm/1RwYYBt4="; + + meta = { + description = "Helpful Cloudflare utility program"; + homepage = "https://github.com/Cyb3r-Jak3/cloudflare-utils"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [yelite]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix index d058e72b4e..f6d440e557 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "RobWalt"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-g5V3Noqh7Y9v/t/dt7n45/NblqNtpZCKELPc9DOkb8A="; + hash = "sha256-SUKV7tH7tvSPtlMcRlOgjvAEqPoBi4J41Ak5k4h4Qj0="; }; - cargoHash = "sha256-zTg/3PcFWzBmKZA7lRIpM3P03d1qpNVBczqWFbnxpic="; + cargoHash = "sha256-FlW0Q2UUt6AX/A0MznGpJY8+yoMs70N58Ow05ly9YyE="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix index bac7f7d8ce..651791803e 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o="; - aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg="; - x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI="; - aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0="; + x86_64-linux = "sha256-uihbLR6JEhj99jz4++7E5z1INBtCskGmZjsTucGznlQ="; + aarch64-linux = "sha256-N/YklwW8T2+Go9kQDZPdGYmgiHHEs4yoOmdPEoH8iqU="; + x86_64-darwin = "sha256-NLv4lZCQ5jFvQdS9c37/bXcCANzXrIsobhZEWxeK4XY="; + aarch64-darwin = "sha256-mLcvgVe9VF9eta7m/jrGgDQx56uDDsOKPTi5Pp6nS3g="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.61"; + version = "1.8.69"; 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"; diff --git a/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix index c9c7588470..3614ce9322 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.29.0"; + version = "15.29.1"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-BvDrhs37XGCQdQV2yQJZXlnNWVArFCMLfFlXuXz9ea0="; + sha256 = "sha256-wiAME0jNtqGbMk6w1jzKUZUzhS0Gg5FgqXD1vuRSpxo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/by-name/co/concord/package.nix b/third_party/nixpkgs/pkgs/by-name/co/concord/package.nix new file mode 100644 index 0000000000..b79368bf0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/concord/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + curl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "concord"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "Cogmasters"; + repo = "concord"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-8k/W6007U1/s3vx03i1929a5RKZtpW/jOr4JDwmzwp8="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + buildInputs = [ curl ]; + + meta = { + description = "Discord API wrapper library made in C"; + homepage = "https://cogmasters.github.io/concord/"; + changelog = "https://github.com/Cogmasters/concord/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emneo ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix rename to third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix index bf30b47d54..ed12a43f2b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix @@ -1,28 +1,32 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, docbook_xml_dtd_45 -, docbook_xsl -, installShellFiles -, libxslt -, pcre -, pkg-config -, python3 -, which + docbook_xml_dtd_45, + docbook_xsl, + installShellFiles, + libxslt, + pcre, + pkg-config, + python3, + which, }: stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.14.1"; + version = "2.14.2"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-KXE3zmhaTweQhs0Qh7Xd5ILiuGVewtrvOkRkt8hjU58="; + hash = "sha256-aVjQqwsTw6TCLxs2oQif3hX5kfXHua7ekBpO/PyneAQ="; }; nativeBuildInputs = [ @@ -40,7 +44,12 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages (ps: [ ps.pygments ])) ]; - makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; + makeFlags = [ + "PREFIX=$(out)" + "MATCHCOMPILER=yes" + "FILESDIR=$(out)/share/cppcheck" + "HAVE_RULES=yes" + ]; enableParallelBuilding = true; strictDeps = true; @@ -73,13 +82,16 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Static analysis tool for C/C++ code"; - homepage = "http://cppcheck.sourceforge.net"; - license = lib.licenses.gpl3Plus; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - maintainers = with lib.maintainers; [ joachifm paveloom ]; + homepage = "http://cppcheck.sourceforge.net"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + joachifm + paveloom + ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crate2nix/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crate2nix/package.nix new file mode 100644 index 0000000000..12ce3f76ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/crate2nix/package.nix @@ -0,0 +1,68 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, cargo +, nix +, nix-prefetch-git +, installShellFiles +, +}: + +rustPlatform.buildRustPackage rec { + pname = "crate2nix"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE="; + }; + + sourceRoot = "${src.name}/${pname}"; + + cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + # Tests use nix(1), which tries (and fails) to set up /nix/var inside the sandbox. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" ${ + lib.makeBinPath [ + cargo + nix + nix-prefetch-git + ] + } + + for shell in bash zsh fish + do + $out/bin/${pname} completions -s $shell + installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname} + done + ''; + + meta = with lib; { + description = "Nix build file generator for Rust crates"; + mainProgram = "crate2nix"; + longDescription = '' + Crate2nix generates Nix files from Cargo.toml/lock files + so that you can build every crate individually in a Nix sandbox. + ''; + homepage = "https://github.com/nix-community/crate2nix"; + changelog = "https://nix-community.github.io/crate2nix/90_reference/90_changelog"; + license = licenses.asl20; + maintainers = with maintainers; [ + kolloch + cole-h + kranzes + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock index 8400022acb..d01a80cf91 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock @@ -349,7 +349,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crunchy-cli" -version = "3.6.6" +version = "3.6.7" dependencies = [ "chrono", "clap", @@ -362,7 +362,7 @@ dependencies = [ [[package]] name = "crunchy-cli-core" -version = "3.6.6" +version = "3.6.7" dependencies = [ "anyhow", "async-speed-limit", @@ -400,9 +400,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d33b8d77c80dea79e66993cb67963b2171dcf0b8fbc87591c58f2dadfea8da2" +checksum = "d6e38c223aecf65c9c9bec50764beea5dc70b6c97cd7f767bf6860f2fc8e0a07" dependencies = [ "async-trait", "chrono", @@ -426,9 +426,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs-internal" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa51945265f25c45f7d53bd70e5263dd023c0be45e38eaba886a971cb645d797" +checksum = "144a38040a21aaa456741a9f6749354527bb68ad3bb14210e0bbc40fbd95186c" dependencies = [ "darling", "quote", @@ -1125,8 +1125,8 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" -source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=b7969a8#b7969a88210096e0570e29d42fb13533baf62aa6" +version = "0.2.12" +source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=c7ac566#c7ac566559d441bbc3e5e5bd04fb7162c38d88b0" dependencies = [ "libc", "log", @@ -1519,9 +1519,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rsubs-lib" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01f7609f0b1bc4fe24b352e8d1792c7d71cc43aea797e14b87974cd009ab402" +checksum = "8c9f50e3fbcbf1f0bd109954e2dd813d1715c7b4a92a7bf159a85dea49e9d863" dependencies = [ "regex", "serde", @@ -1967,9 +1967,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", @@ -1984,9 +1984,9 @@ 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", diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix index 7ab919f6c2..4a5e9236ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "crunchy-cli"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = "crunchy-cli"; rev = "v${version}"; - hash = "sha256-LVJRv8YUTfavc0ZrK2fIlgc5npQKwEZosoLEYw/V/pw="; + hash = "sha256-qBIfDkd4a0m1GNgK4tSq2/dLP8K5Pp4m/M468eHgIAg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "native-tls-0.2.11" = "sha256-r+uvpwf1qgOVYuh+3xYOOsDWyCJnyG4Qc8i7RV2nzy4="; + "native-tls-0.2.12" = "sha256-YqiX3xj2ionDlDRzkClqkt0E4HY4zt0B6+rGf850ZCk="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/cs/css-checker/package.nix b/third_party/nixpkgs/pkgs/by-name/cs/css-checker/package.nix new file mode 100644 index 0000000000..43e2fb5367 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cs/css-checker/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "css-checker"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "ruilisi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lD2uF8zhJG8pVepqxyKKj4GZNB883uDV/9dCMFYJbRs="; + }; + + vendorHash = "sha256-4ZCma8Q7FXAWdA1m2M1ltm360Fu65JhELyfIbJBP14M="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Command-line tool for identifying similar or duplicated CSS code"; + homepage = "https://github.com/ruilisi/css-checker"; + license = licenses.mit; + maintainers = with maintainers; [ arikgrahl ]; + mainProgram = "css-checker"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix index 39a506dbc6..b2f8359419 100644 --- a/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-hhu66uiBkxyYRw8eruqxVifr2yftDXcYRTK5VYbjRPQ="; + hash = "sha256-C3BvI43oo71y19ZRflqhKRQF7DwBBOV0yRlutv+W18g="; }; vendorHash = "sha256-FsFignBh669E60S8l8siQHLzeSfB5X/XOHBXPMDX3Cg="; diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix new file mode 100644 index 0000000000..a8eef17291 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + makeWrapper, + perl, + gnused, + ghostscript, + file, + coreutils, + gnugrep, + which, +}: +let + arches = [ + "x86_64" + "i686" + ]; + version = "4.1.0-1"; + + runtimeDeps = [ + ghostscript + file + gnused + gnugrep + coreutils + which + ]; +in +stdenv.mkDerivation { + pname = "cups-brother-mfcl2800dw"; + inherit version; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf106048/mfcl2800dwpdrv-${version}.i386.deb"; + hash = "sha256-sY92w0EFI69LxoNrhluIhqFOWZQOI+SJKKyuExvasgA="; + }; + + installPhase = + '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + # delete unnecessary files for the current architecture + '' + + lib.concatMapStrings (arch: '' + echo Deleting files for ${arch} + rm -r "$out/opt/brother/Printers/MFCL2800DW/lpd/${arch}" + '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches) + + '' + + # bundled scripts don't understand the arch subdirectories for some reason + ln -s \ + "$out/opt/brother/Printers/MFCL2800DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \ + "$out/opt/brother/Printers/MFCL2800DW/lpd/" + + # Fix global references and replace auto discovery mechanism with hardcoded values + substituteInPlace $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \ + --replace-fail /opt "$out/opt" \ + --replace-fail "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2800DW\"; #" \ + --replace-fail "PRINTER =~" "PRINTER = \"MFCL2800DW\"; #" + + # Make sure all executables have the necessary runtime dependencies available + find "$out" -executable -and -type f | while read file; do + wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}" + done + + # Symlink filter and ppd into a location where CUPS will discover it + mkdir -p $out/lib/cups/filter $out/share/cups/model + + ln -s \ + $out/opt/brother/Printers/MFCL2800DW/lpd/lpdfilter \ + $out/lib/cups/filter/brother_lpdwrapper_MFCL2800DW + + ln -s \ + $out/opt/brother/Printers/MFCL2800DW/cupswrapper/brother-MFCL2800DW-cups-en.ppd \ + $out/share/cups/model/ + + runHook postInstall + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother MFC-L2750DW printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = builtins.map (arch: "${arch}-linux") arches; + maintainers = [ lib.maintainers.luftmensch-luftmensch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cv/cvemap/package.nix b/third_party/nixpkgs/pkgs/by-name/cv/cvemap/package.nix index efd51d838e..a9709006e2 100644 --- a/third_party/nixpkgs/pkgs/by-name/cv/cvemap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cv/cvemap/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cvemap"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cvemap"; rev = "refs/tags/v${version}"; - hash = "sha256-aeUYcgBTHWWLTuAXnnc73yXaC3yLZzruqvedUYCnht4="; + hash = "sha256-Ste08J3KIJmugKZegU82wq6N+B5DaHc8Z0UtqKsUYE8="; }; - vendorHash = "sha256-VQGWi01mOP2N4oYsaDK7wn/+hSFEDHhSma9DOZ06Z3k="; + vendorHash = "sha256-+gYJkKJLUsCbh0JhVNOdr8U5pgWYjD56KZ0VePoYecU="; subPackages = [ "cmd/cvemap/" diff --git a/third_party/nixpkgs/pkgs/by-name/cy/cyclonedds-cxx/package.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyclonedds-cxx/package.nix new file mode 100644 index 0000000000..e3c4aec9e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cy/cyclonedds-cxx/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cyclonedds +}: + +stdenv.mkDerivation rec { + pname = "cyclonedds-cxx"; + version = "0.10.5"; + + outputs = ["out" "dev"]; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds-cxx"; + rev = version; + hash = "sha256-whFVEQec/Ca+dr6R7z9mMrNg315z3oIWchVT+vQ36So="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ cyclonedds ]; + + meta = with lib; { + description = "C++ binding for Eclipse Cyclone DDS"; + homepage = "https://cyclonedds.io/"; + license = with licenses; [ epl20 asl20 ]; + maintainers = with maintainers; [ linbreux ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix index 34115a39d2..fff4e336b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.1.0"; + version = "24.1.1"; src = let @@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-cJcjUoZSpD87jy4GGIxMinZW4gxRZfcGO0GdGUGXI6g="; - aarch64-linux = "sha256-96t/T/VzzzaSWJbPBb1CH2FXqfhiH1d0MjRoPsRMRwo="; - x86_64-darwin = "sha256-8xqSL8fTveg1Y5huBTYZLyubajt27h4XUBzyYVF394A="; - aarch64-darwin = "sha256-r7WqJrNF1IgQHx3Na1fGk0ywsfh5t4Dl/u8hH6CPuoE="; + x86_64-linux = "sha256-33W7uDxzfAQ5gH10sI4IbzmHl8SxQLYj88C/BGOoRks="; + aarch64-linux = "sha256-ZAr9vymCdLFAYiXEXtT+97x1tY5mrbr2N6INj4Bp4Nk="; + x86_64-darwin = "sha256-dgOtufARRVmwtXl+csmr2sMBzDvq+5XRotOQrTz8jys="; + aarch64-darwin = "sha256-R5TQJq+sRUFHH8EuaXgeSJUOnhepbCJLTUmO0FMOgzE="; }; in fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix index 5d80b7a957..58dff97c8b 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.64.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-kO5bRLbHNObDLGURrEgNLK70ml2FVDQioLa8cbBBurk="; + hash = "sha256-Q1qQjIRyOeFr8qrZJZ1IkO12RM2hp4IxI1NI7WqpmZA="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.json b/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.json new file mode 100644 index 0000000000..17483d559a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.json @@ -0,0 +1,33 @@ +{ + "name": "diagnostic-languageserver", + "version": "1.15.0", + "description": "diagnostic language server", + "main": "./lib/index.js", + "repository": "git@github.com:iamcco/diagnostic-languageserver.git", + "author": "iamcco ", + "license": "MIT", + "scripts": { + "build": "tsc -p ./", + "watch": "tsc -w -p ./" + }, + "bin": { + "diagnostic-languageserver": "./bin/index.js" + }, + "dependencies": { + "commander": "^5.1.0", + "find-up": "^4.1.0", + "lodash": "^4.17.15", + "rxjs": "^6.5.5", + "tempy": "^0.7.1", + "tslib": "^1.11.2", + "vscode-languageserver": "^6.1.1", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-uri": "^2.1.1" + }, + "devDependencies": { + "@types/lodash": "^4.14.150", + "@types/node": "^11.11.3", + "ignore": "^5.1.8", + "typescript": "^3.8.3" + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.nix b/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.nix new file mode 100644 index 0000000000..81d99c83ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/di/diagnostic-languageserver/package.nix @@ -0,0 +1,41 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "diagnostic-languageserver"; + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "iamcco"; + repo = "diagnostic-languageserver"; + rev = "v${version}"; + hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + doDist = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "General purpose Language Server that integrate with linter to support diagnostic features"; + homepage = "https://github.com/iamcco/diagnostic-languageserver"; + changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "diagnostic-languageserver"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix index fbf6e78423..a1b5574ca9 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/third_party/nixpkgs/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 ivar ]; + maintainers = with maintainers; [ eclairevoyant ]; platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter-cli"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix index f31256ad85..bff13f92f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dorion"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-bVanhJqHQxe3imP07EsRuDu0Isj9rf4VoIjmoAPfaQk="; + hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ="; }; unpackCmd = '' diff --git a/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix index 5be0657523..f4cab21b1b 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix @@ -1,14 +1,14 @@ { lib, - stdenv, - fetchFromGitHub, - fetchpatch, SDL2, SDL2_image, SDL2_net, alsa-lib, darwin, + fetchFromGitHub, + fetchpatch, fluidsynth, + gitUpdater, glib, gtest, iir1, @@ -18,7 +18,6 @@ libmt32emu, libogg, libpng, - zlib-ng, libpulseaudio, libslirp, libsndfile, @@ -28,7 +27,9 @@ opusfile, pkg-config, speexdsp, - nix-update-script, + stdenv, + testers, + zlib-ng, }: stdenv.mkDerivation (finalAttrs: { @@ -60,6 +61,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ + SDL2 + SDL2_image + SDL2_net fluidsynth glib iir1 @@ -69,15 +73,12 @@ stdenv.mkDerivation (finalAttrs: { libmt32emu libogg libpng - zlib-ng libpulseaudio libslirp libsndfile opusfile - SDL2 - SDL2_image - SDL2_net speexdsp + zlib-ng ] ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin ( @@ -89,29 +90,40 @@ stdenv.mkDerivation (finalAttrs: { ] ); + outputs = [ "out" "man" ]; + postInstall = '' install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/ ''; + # Rename binary, add a wrapper, and copy manual to avoid conflict with + # original dosbox. Doing it this way allows us to work with frontends and + # launchers that expect the binary to be named dosbox, but get out of the way + # of vanilla dosbox if the user desires to install that as well. postFixup = '' - # Rename binary, add a wrapper, and copy manual to avoid conflict with - # original dosbox. Doing it this way allows us to work with frontends and - # launchers that expect the binary to be named dosbox, but get out of the - # way of vanilla dosbox if the user desires to install that as well. mv $out/bin/dosbox $out/bin/dosbox-staging makeWrapper $out/bin/dosbox-staging $out/bin/dosbox - # Create a symlink to dosbox manual instead of copying it - pushd $out/share/man/man1/ + pushd $man/share/man/man1/ ln -s dosbox.1.gz dosbox-staging.1.gz popd ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "dosbox --version"; + }; + }; + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; meta = { homepage = "https://dosbox-staging.github.io/"; - description = "Modernized DOS emulator"; + description = "Modernized DOS emulator; DOSBox fork"; longDescription = '' DOSBox Staging is an attempt to revitalize DOSBox's development process. It's not a rewrite, but a continuation and improvement on the diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.json b/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.json new file mode 100644 index 0000000000..3ad9bff441 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.json @@ -0,0 +1,26 @@ +{ + "name": "dotenv-cli", + "description": "A global executable to run applications with the ENV variables loaded by dotenv", + "version": "7.4.3", + "author": "entropitor", + "bin": { + "dotenv": "./cli.js" + }, + "dependencies": { + "cross-spawn": "^7.0.3", + "dotenv": "^16.3.0", + "dotenv-expand": "^10.0.0", + "minimist": "^1.2.6" + }, + "devDependencies": { + "standard": "^16.0.4" + }, + "license": "MIT", + "main": "index.js", + "preferGlobal": true, + "repository": "entropitor/dotenv-cli", + "scripts": { + "lint": "standard" + }, + "resolutions": {} +} diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.nix new file mode 100644 index 0000000000..298fb07118 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/do/dotenv-cli/package.nix @@ -0,0 +1,34 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "dotenv-cli"; + version = "7.4.3"; + + src = fetchFromGitHub { + owner = "entropitor"; + repo = "dotenv-cli"; + rev = "v${version}"; + hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI to load dotenv files"; + homepage = "https://github.com/entropitor/dotenv-cli"; + changelog = "https://github.com/entropitor/dotenv-cli/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "dotenv"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/misc/dtv-scan-tables/default.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtv-scan-tables/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/data/misc/dtv-scan-tables/default.nix rename to third_party/nixpkgs/pkgs/by-name/dt/dtv-scan-tables/package.nix index fdd18cec8d..0009fdb63a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/dt/dtv-scan-tables/package.nix @@ -4,13 +4,13 @@ , v4l-utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dtv-scan-tables"; - version = "2022-04-30-57ed29822750"; + version = "2024-03-24-7098bdd27548"; src = fetchurl { - url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4="; + url = "https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${finalAttrs.version}.tar.bz2"; + hash = "sha256-P0yJgbOkgpBms5arwNonDlx+Z0tdGQ6SUyoGlRoH6Y4="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { allowedReferences = [ ]; - meta = with lib; { + meta = { # git repo with current revision is here: #downloadPage = "https://git.linuxtv.org/dtv-scan-tables.git"; # Weekly releases are supposed to be here @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # but sometimes they lag behind several weeks or even months. description = "Digital TV (DVB) channel/transponder scan tables"; homepage = "https://www.linuxtv.org/wiki/index.php/Dtv-scan-tables"; - license = with licenses; [ gpl2Only lgpl21Only ]; + license = with lib.licenses; [ gpl2Only lgpl21Only ]; longDescription = '' When scanning for dvb channels, most applications require an initial set of @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { The package delivers a collection of transponder tables ready to be used by software like "dvbv5-scan". ''; - maintainers = with maintainers; [ yarny ]; + maintainers = with lib.maintainers; [ yarny ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix index 897f5cfc5b..599abeaa12 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-Pv7GySqKD3G1eryq6YwVL159XuuWB8DmQ0d1fPuFcmc="; + hash = "sha256-T/EFy89CZyBthfxGlCJtovDmcR1ntYFkgAOA/sg3GWs="; }; - cargoHash = "sha256-MKJCpSdf9MzpBmgWImYO5+uSVN9uTLaLl4khizVGoig="; + cargoHash = "sha256-nF8govoQILX6ft5iJWHAMQA/UgeNrkdUNulO+sX2jXo="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/by-name/du/durden/package.nix b/third_party/nixpkgs/pkgs/by-name/du/durden/package.nix index 3d72e13296..96d721a556 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/durden/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/durden/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchFromGitHub, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; - version = "unstable-2023-10-23"; + version = "0-unstable-2024-06-23"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "347dba6da011bbaa70c6edaf82a2d915f4057db3"; - hash = "sha256-iNf7fOzz7mf1CXG5leCenkSTrdCc9/KL8VLw8gUIyKE="; + rev = "dffb94b69355ffa9cda074c1d0a48af74b78c220"; + hash = "sha256-sBhlBk4vAYwedw4VerUfY80SXbVoEDid54si6qwDeXs="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix b/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix index 2d80eede0b..556268f7a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoModule, fetchFromGitHub }: let pname = "e1s"; - version = "1.0.37"; + version = "1.0.38"; in buildGoModule { inherit pname version; @@ -10,7 +10,7 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; rev = "refs/tags/v${version}"; - hash = "sha256-lqaLfGEllyRlVPkUfLUzPO2o+Ruzp1lFD6/RY4o1L14="; + hash = "sha256-OFnriW+rerVTyonuXe9qilR78Qok6QUYQvTDbsTi5L0="; }; vendorHash = "sha256-oQVZ1SNXaXOngZazUVeWLvtZu17XvtIcrx+XC6PvGH0="; diff --git a/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix new file mode 100644 index 0000000000..4d4e038f85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }: + +rustPlatform.buildRustPackage rec { + pname = "ear2ctl"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "bharadwaj-raju"; + repo = "ear2ctl"; + rev = version; + hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; + }; + + cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = { + description = "Linux controller for the Nothing Ear (2)"; + homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; + maintainers = with lib.maintainers; [ jaredmontoya ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "ear2ctl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/em/emote/package.nix b/third_party/nixpkgs/pkgs/by-name/em/emote/package.nix new file mode 100644 index 0000000000..1854bc1b1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/em/emote/package.nix @@ -0,0 +1,85 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + gobject-introspection, + keybinder3, + xdotool, + wl-clipboard, +}: + +python3Packages.buildPythonApplication rec { + pname = "emote"; + version = "4.1.0"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "tom-james-watson"; + repo = "Emote"; + rev = "v${version}"; + hash = "sha256-c5EY1Cc3oD8EG1oTChbl10jJlNeAETQbAFGoA9Lw5PY="; + }; + + postPatch = '' + substituteInPlace emote/picker.py \ + --replace-fail 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" + substituteInPlace emote/config.py \ + --replace-fail 'is_flatpak = os.environ.get("FLATPAK") is not None' 'is_flatpak = False' \ + --replace-fail 'os.environ.get("SNAP")' "'$out/share/emote'" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook3 + gobject-introspection + ]; + + buildInputs = [ + # used by gobject-introspection's setup-hook and only detected at runtime + keybinder3 + ]; + + dependencies = with python3Packages; [ + dbus-python.out # don't propagate dev output + manimpango + pygobject3.out # don't propagate dev output + setproctitle + ]; + + postInstall = '' + rm $out/share/emote/emote/{emote.in,meson.build} + rm $out/share/emote/static/{meson.build,com.tomjwatson.Emote.desktop,prepare-launch} + ''; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${ + lib.makeBinPath [ + xdotool + wl-clipboard + ] + } + ) + ''; + + meta = with lib; { + description = "Modern emoji picker for Linux"; + mainProgram = "emote"; + homepage = "https://github.com/tom-james-watson/emote"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + emilytrau + SuperSandro2000 + aleksana + ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ey/eyewitness/package.nix b/third_party/nixpkgs/pkgs/by-name/ey/eyewitness/package.nix new file mode 100644 index 0000000000..7cda284f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ey/eyewitness/package.nix @@ -0,0 +1,70 @@ +{ lib +, fetchFromGitHub +, python3Packages +, cmake +, xvfb-run +, firefox-esr +, geckodriver +, makeWrapper +}: + +python3Packages.buildPythonApplication rec { + pname = "eye-witness"; + version = "20230525.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "redsiege"; + repo = "EyeWitness"; + rev = "v${version}"; + hash = "sha256-nSPpPbwqagc5EadQ4AHgLhjQ0kDjmbdcwE/PL5FDL4I="; + }; + + build-system = with python3Packages; [ + setuptools + ] ++ [ + makeWrapper + ]; + + dependencies = with python3Packages; [ + selenium + fuzzywuzzy + pyvirtualdisplay + pylev + netaddr + pydevtool + ] ++ [ + firefox-esr + xvfb-run + geckodriver + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/eyewitness} + cp -R * $out/share/eyewitness + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + makeWrapper "${python3Packages.python.interpreter}" "$out/bin/eyewitness" \ + --set PYTHONPATH "$PYTHONPATH" \ + --add-flags "$out/share/eyewitness/Python/EyeWitness.py" + + runHook postFixup + ''; + + meta = with lib; { + description = "Take screenshots of websites, and identify admin interfaces"; + homepage = "https://github.com/redsiege/EyeWitness"; + changelog = "https://github.com/redsiege/EyeWitness/blob/${src.rev}/CHANGELOG"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tochiaha ]; + mainProgram = "eye-witness"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix index 0ba619b693..788a47db81 100644 --- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.19"; + version = "0.18.21"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-UP0z7rcOmwKqpmKkQy5/6W+XWKfAiEQifKOnrdCgBYo="; + hash = "sha256-d1xY0yu28a+TfIMUlQN/v3UgfhVVmQL9jGLJVc8o/Xc="; }; - cargoHash = "sha256-x53sQ/DEx7SkQ8vECg/5lkcdJA3WbcDaYapbXub+9nA="; + cargoHash = "sha256-w8xAk4eBXAOD93IIjD5MIDerPMSvw2IN9QTOKc04DK4="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix index d543827568..47904df25d 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-dfgRRh8yJUDkMgl32ddx8iQElwRt0hCBsObud7rbTYQ="; + hash = "sha256-QK3AlB6tT1pl2qNX/DWPQzpjs9+EhJO9gHtNTNOE41E="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix new file mode 100644 index 0000000000..dba53dbe88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-minecraft"; + version = "0.1.20240629"; + + src = fetchurl { + url = "https://github.com/oldherl/fcitx5-pinyin-minecraft/releases/download/${finalAttrs.version}/minecraft-cn.dict"; + hash = "sha256-uD/ADL+JGdSYiNz6XIqJB0Y0IU6Jf56q5g7xG2o3a+E="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/minecraft.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.minecraft.wiki"; + homepage = "https://github.com/oldherl/fcitx5-pinyin-minecraft"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix new file mode 100644 index 0000000000..624e009134 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-moegirl"; + version = "20240609"; + + src = fetchurl { + url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; + hash = "sha256-dXFV0kVr8hgT17Jmr28PiYTiELm8kS/KM71igHXA6hs="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/moegirl.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.moegirl.org.cn"; + homepage = "https://github.com/outloudvi/mw2fcitx"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix new file mode 100644 index 0000000000..c28c18ae63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchurl, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-zhwiki"; + version = "0.2.5"; + date = "20240509"; + + src = fetchurl { + url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; + hash = "sha256-uRpKPq+/xJ8akKB8ol/JRF79VfDIQ8L4SxLDXzpfPxg="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/zhwiki.dict + + runHook postInstall + ''; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.wikipedia.org"; + homepage = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki"; + license = with lib.licenses; [ unlicense cc-by-sa-40 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix new file mode 100644 index 0000000000..133a364563 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix @@ -0,0 +1,91 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, protobuf +, rustPlatform +, buildPackages +, git +, stdenv +, libiconv +, clang +, libclang +, Security +, SystemConfiguration +}: +rustPlatform.buildRustPackage rec { + pname = "fedimint"; + version = "0.3.2-rc.0"; + + src = fetchFromGitHub { + owner = "fedimint"; + repo = "fedimint"; + rev = "v${version}"; + hash = "sha256-eOGmx/freDQLxZ48nP9Y2kA84F6sdig6qfZwnJfOB3g="; + }; + + cargoHash = "sha256-2ctrZLvovgMpxZPFtmblZ/NGyxievE6FmzC4BBGuw6g="; + + nativeBuildInputs = [ + protobuf + pkg-config + clang + libclang.lib + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + Security + SystemConfiguration + ]; + + outputs = [ "out" "fedimintCli" "fedimint" "gateway" "gatewayCli" "devimint" ]; + + postInstall = '' + mkdir -p $fedimint/bin $fedimintCli/bin $gateway/bin $gatewayCli/bin $devimint/bin + + # delete fuzzing targets and other binaries no one cares about + binsToKeep=(fedimint-cli fedimint-dbtool recoverytool fedimintd gatewayd gateway-cli gateway-cln-extension devimint) + keepPattern=$(printf "|%s" "''${binsToKeep[@]}") + keepPattern=''${keepPattern:1} + find "$out/bin" -maxdepth 1 -type f | grep -Ev "(''${keepPattern})" | xargs rm -f + + # fix the upstream name + mv $out/bin/recoverytool $out/bin/fedimint-recoverytool + + + cp -a $releaseDir/fedimint-cli $fedimintCli/bin/ + cp -a $releaseDir/fedimint-dbtool $fedimintCli/bin/ + cp -a $releaseDir/recoverytool $fedimintCli/bin/fedimint-recoverytool + + cp -a $releaseDir/fedimintd $fedimint/bin/ + + cp -a $releaseDir/gateway-cli $gatewayCli/bin/ + + cp -a $releaseDir/gatewayd $gateway/bin/ + cp -a $releaseDir/gateway-cln-extension $gateway/bin/ + + cp -a $releaseDir/devimint $devimint/bin/ + ''; + + PROTOC = "${buildPackages.protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + OPENSSL_DIR = openssl.dev; + LIBCLANG_PATH = "${libclang.lib}/lib"; + + FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; + + # currently broken, will require some upstream fixes + doCheck = false; + + meta = { + description = "Federated E-Cash Mint"; + homepage = "https://github.com/fedimint/fedimint"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ dpc ]; + mainProgram = "fedimint-cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fe/fennel-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/fennel-ls/package.nix index bab9da849f..0ee7299c86 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/fennel-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/fennel-ls/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fennel-ls"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromSourcehut { owner = "~xerool"; repo = "fennel-ls"; rev = finalAttrs.version; - hash = "sha256-8TDJ03x9dkfievbovzMN3JRfIKba3CfzbcRAZOuPbKs="; + hash = "sha256-7NifEbOH8TDzon3f6w4I/7uryE1e9M5iYvqEb0hLv5s="; }; buildInputs = [ lua @@ -22,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Language server for intelligent editing of the Fennel Programming Language"; homepage = "https://git.sr.ht/~xerool/fennel-ls/"; - license = licenses.mit; - changelog = "https://git.sr.ht/~xerool/fennel-ls/refs/${version}"; - maintainers = with maintainers; [ + license = lib.licenses.mit; + changelog = "https://git.sr.ht/~xerool/fennel-ls/refs/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch yisraeldov ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix b/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix index 73ec95ab3b..d8bacf1665 100644 --- a/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.16"; + version = "8.5.25"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; + hash = "sha256-GrN19ONZ4a400d3BM7bdpR/+v0F4Q13+zcGqvDBcEPU="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix index 3d78e105ce..1052fd62ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.72"; + version = "2.13.80"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-u5hAUGGaMpUub4WL8CGEzbnfXPRouaGbb8SQ6ep3X3Q="; + hash = "sha256-uwWdmDCmFyArvzVFTOfdBqHglsap/wvyOjRq9KLFyOE="; }; - vendorHash = "sha256-y4XZeugjqy6ydAq6KQ8iIgMgE6iHAEqzzi2A+N1LB3M="; + vendorHash = "sha256-VCsNI6MnraE9orrHCAVRZg3uYxhicuyBT3+Jp5q8DDc="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix index f79c09c8d3..25a9cccf58 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix @@ -8,15 +8,18 @@ rustPlatform, cups, + ffmpeg, firefox-unwrapped, libcanberra-gtk3, libglvnd, libnotify, + libpulseaudio, libva, mesa, nixosTests, openssl, pciutils, + pipewire, pkg-config, stdenv, udev, @@ -68,11 +71,14 @@ rustPlatform.buildRustPackage rec { libs = lib.optionals stdenv.isLinux [ cups + ffmpeg libglvnd libnotify + libpulseaudio libva mesa pciutils + pipewire udev xorg.libXScrnSaver ] diff --git a/third_party/nixpkgs/pkgs/by-name/fi/fixjson/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/fixjson/package.nix new file mode 100644 index 0000000000..52ed03c690 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fi/fixjson/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub +}: + +buildNpmPackage { + pname = "fixjson"; + version = "1.1.2-unstable-2021-01-05"; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "fixjson"; + # Upstream has no tagged releases, but this commit bumps version + rev = "d0483f9cc59896ea59bb16f906f770562d332000"; + hash = "sha256-Mu7ho0t5GzFYuBK6FEXhpsaRxn9HF3lnvMxRpg0aqYI="; + }; + + npmDepsHash = "sha256-tnsgNtMdnrKYxcYy9+4tgp1BX+o8e5/HUDeSP5BOvUQ="; + + meta = { + description = "JSON Fixer for Humans using (relaxed) JSON5"; + homepage = "https://github.com/rhysd/fixjson"; + license = lib.licenses.mit; + mainProgram = "fixjson"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix index 600d39d4d1..be3cc19a1f 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-FeUZYOa35WOxSagCwN0Cq4cbvrEgRr1xjfHGqGvZSxY="; + hash = "sha256-h6NLX++cf9pn8plZUKyiE3qcsiXGYHngRio34Mp341g="; }; - vendorHash = "sha256-Ae3KC7D5PrIGd29pGPVTu56DIlJS0CLViLnK6FY7KU0="; + vendorHash = "sha256-k1JZGkJy5oGI3pEcrStNrsQTh8diNoe4DARqRX4PGS8="; subPackages = [ "cmd/flarectl" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flashmq/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashmq/package.nix index 4cf312476d..cb39bc06b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flashmq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-6ShMYTynqIVm7EH3b9Jzy5UKE7SH/Lq5uWV3VaDVREQ="; + hash = "sha256-4ZK8aHDhI0yslx1VoO+cgqj4YQ6AgE0Jy5C4WJ4k4OQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix index e33a259bd2..a373c870c5 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix @@ -27,13 +27,13 @@ let pieBuild = stdenv.hostPlatform.isMusl; in buildGoModule rec { pname = "frankenphp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; rev = "v${version}"; - hash = "sha256-W+9p/9qT7v1jq6m/gRgfw4AmnPRZVY3UixXaypUVn4E="; + hash = "sha256-VHN5ezPwWZ9cKcaGyIkNh2RnD9ETt/3I+/QmAV6DY3o="; }; sourceRoot = "${src.name}/caddy"; @@ -41,7 +41,7 @@ in buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-eNW03oBaON2X5X2ZbM3Ly5T+bJzSDhEYajY5LaZhwdQ="; + vendorHash = "sha256-37nt6UuHgZZ7ZZlqgE3ggGwtiJwT2lgnwV1Pt3RsU7o="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix index 1cb06e5963..c7a1dc5f2a 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecell-solver"; - version = "6.10.0"; + version = "6.12.0"; src = fetchurl { url = "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${finalAttrs.version}.tar.xz"; - hash = "sha256-RDuineCL51GmD6ykKoF7ZbNCzqkxiP12UXQbdQSDebQ="; + hash = "sha256-oriegEzkuRjvdJAxZ2IQ8glf6jqMsSmAVgKEPHxIhKA="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fx/default.nix b/third_party/nixpkgs/pkgs/by-name/fx/fx/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/tools/fx/default.nix rename to third_party/nixpkgs/pkgs/by-name/fx/fx/package.nix index bcb458f0b6..cdd3f7a8f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fx/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fx/fx/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "fx"; - version = "34.0.0"; + version = "35.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-gVeeCJOqrEua5quID1n1928oHtP9gfIDe4erVn1y2Eo="; + hash = "sha256-EirlA/gcW77UP9I4pVCjjG3pSYnCPw+idX9YS1izEpY="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-otORAeD9+J6/10TDusEnFfRRxTb/52Zk7Ttaw46xnsU=/sTS1mJw="; + vendorHash = "sha256-h9BUL7b8rNmhVxmXL3CBF39WSkX+8eS2M9NDJhbPI0o="; postInstall = '' installShellCompletion --cmd fx \ diff --git a/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix index 5bc3552fcc..ae8681bf1c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-x+y0K6b/yCskowOuvjcSCJXM5ym2Qn84/Thui0ahUKU="; + hash = "sha256-hrPBuNCtwYOynv0JUcEq0lVZ9k3iVPNyn04l8zVbkN4="; }; - cargoHash = "sha256-cIoc3sGy33iTkVAln4oSYSBGB0iAFanv746upxnv0ZA="; + cargoHash = "sha256-O7rQp70ukw7LiC+m7rlqEGHVJw3Lo93WEmL3PFD7kBM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gate/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gate/package.nix index 48aaa97f8b..2498dc45b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.37.1"; + version = "0.38.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-2oWC6l6SFrulk0EPLVtFfMKfVPHZFOngKjvOLprg/Yk="; + hash = "sha256-kiVyrmAXRDreGIBq9bJhscULjbPgoDVv8kw9APJ5TQk="; }; vendorHash = "sha256-JaBcGcqFqp9Il3FyU/QwThuggzPg8HWScvFHEAgtgBU="; diff --git a/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.json b/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.json new file mode 100644 index 0000000000..ade37982b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.json @@ -0,0 +1,35 @@ +{ + "name": "get-graphql-schema", + "bin": "dist/index.js", + "files": [ + "README.md", + "dist/" + ], + "version": "2.1.1", + "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL", + "scripts": { + "build": "tsc", + "prepublish": "npm run build && chmod +x dist/index.js", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/graphcool/get-graphql-schema.git" + }, + "author": "Johannes Schickling ", + "license": "MIT", + "dependencies": { + "@types/chalk": "^0.4.31", + "@types/graphql": "^0.8.6", + "@types/minimist": "^1.2.0", + "@types/node": "^7.0.4", + "@types/node-fetch": "^1.6.7", + "chalk": "^1.1.3", + "graphql": "^0.9.1", + "minimist": "^1.2.0", + "node-fetch": "^1.6.3" + }, + "devDependencies": { + "typescript": "^2.1.5" + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.nix new file mode 100644 index 0000000000..25d9f83977 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -0,0 +1,43 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nodejs_22 +}: mkYarnPackage rec { + pname = "get-graphql-schema"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "prisma-labs"; + repo = "get-graphql-schema"; + rev = "v${version}"; + hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + postFixup = '' + substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \ + --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}" + chmod +x $out/bin/get-graphql-schema + ''; + meta = { + description = "Command line tool for generating a changelog from git tags and commit history"; + homepage = "https://github.com/cookpete/auto-changelog"; + changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "get-graphql-schema"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix index 69a0774010..84f1709f30 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.4"; + version = "0.2.5"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-lrGWt3y8IbGzOjp6k3nZD4CnC1S9aMpJPwNL/Mik5Lw="; + hash = "sha256-tizA5BLZZ/9gfHv2X8is7EJD1reMvfA7c6JETUoUgvI="; }; - cargoHash = "sha256-+mBxHC7AzHuQ/k9OwT92iL25aW0WXyPcG5SOsWdgV5U="; + cargoHash = "sha256-kIIwswj8mfpY382O0bdMoSk6+T+614l2QCeRgz3ZxEY="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-run/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-run/package.nix new file mode 100644 index 0000000000..a9f257b24b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-run/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "git-run"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "mixu"; + repo = "gr"; + rev = "v${version}"; + hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc="; + }; + + npmDepsHash = "sha256-PdxKFopmuNRWkSwPDX1wcNTvRtbVScl1WsZi7sdkKMw="; + + makeCacheWritable = true; + dontBuild = true; + + meta = { + description = "Multiple git repository management tool"; + homepage = "https://mixu.net/gr/"; + license = lib.licenses.bsd3; + mainProgram = "gr"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix index c5729b5dbe..3a7689c925 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-2YcQl9aPFPE/t/Pzoo0mWkCjOE6b4BJH0oT8Gbx+vIg="; + hash = "sha256-cbH2gXMBD/D+dqdYLcFZxvhuSZklw2hi2+9mrqu+pjc="; }; - cargoHash = "sha256-RldCa0UITX8zj5tliww1xiL1Y60t9EN6o1ZA5eVEaT4="; + cargoHash = "sha256-UB4z0jh0AQAareRbS7l/402u0yZxEV748xzE/fQcQfY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix index 029f86e230..38fea1d79c 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.2.1"; + version = "0.11.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-yHktQZ/s3RYcRQd0U+0VTnLOMTyRmlny9RtAdfFT6J8="; + hash = "sha256-onpW7YolM05C1BKb7vgH6Y2XFNbigRTueMqjzuFWERo="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +20,7 @@ let src = gitSrc; - npmDepsHash = "sha256-WKwEAVMG6r/ZFmxgLR+zJCW8F2DOHxpWDYqhX/vcdrs="; + npmDepsHash = "sha256-V4lB+lgnurEo4BPVQDIYxdzKczPPDa6QEFaTAm+go88="; dontNpmInstall = true; @@ -40,7 +40,7 @@ in buildGoModule rec { src = gitSrc; - vendorHash = "sha256-ADa3nQZ/5K9m0aB5NwGQpjqhGwAne5pN2Z5RUb3eEcU="; + vendorHash = "sha256-besBympQMvdsD25nndyRkcA8v3wMQUb52VCwvtopgPc="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix new file mode 100644 index 0000000000..d855c419ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gl/glrnvim/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "glrnvim"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "beeender"; + repo = "glrnvim"; + rev = "v${version}"; + sha256 = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; + }; + + cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + + postInstall = '' + install -Dm644 glrnvim.desktop -t $out/share/applications + install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg + ''; + + meta = { + description = "Really fast & stable neovim GUI which could be accelerated by GPU"; + homepage = "https://github.com/beeender/glrnvim"; + mainProgram = "glrnvim"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aacebedo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix index 204fa79b1f..858f1d1aa9 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.13"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nrkc+uYgPES3CfRjmfH/9eM6NL8Vo3kUBX9JHEw/1C4="; + sha256 = "sha256-m4WGmY/H2XQO23klpHxbTtDxjeUkVvI+T5ZCPy5bjac="; }; - vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; + vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix index 15b444728b..519b640512 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "126.0.6478.114"; + version = "126.0.6478.126"; 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-CGqo6XnUwndOjODOxy+TCGxDXbAz4EwkZMOl7ZLFsAc="; + hash = "sha256-PsHK27Vc9mzFHwQh6s4ySoiDbuLZgrlFuPZ6PxMbCSQ="; }; nativeBuildInputs = [ patchelf makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix index 66d6f632bc..3c22d8c76a 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "alloy"; - hash = "sha256-jaOQG+QkVi10lUp6izvSGE9j76ULc4yKbxdDhLHykYI="; + hash = "sha256-0AR7JE79QHA6nO6Wu3ebousH2pyeDiP4+9DnUL/OSYI="; }; proxyVendor = true; - vendorHash = "sha256-6Xc2siImM1Dl716uGhtAGcn+PO2OLuYLxanzg8Ho6SA="; + vendorHash = "sha256-Pnf/oiwldRIjvVa85igwQ/AoT/iups7LQ46T2iGAIlM="; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; @@ -57,7 +57,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - sha256 = "sha256-o3vCI9GHCr4SjYsiT0wQ4mN76QeAGwOfLVCzGp7NMf4="; + hash = "sha256-8/siWMFoUokMXJ13QT8050AXynsApiC67TP/7Hvugsk="; }; preBuild = '' @@ -107,7 +107,6 @@ buildGoModule rec { inherit (nixosTests) alloy; version = testers.testVersion { version = "v${version}"; - command = "${lib.getExe grafana-alloy} --version"; package = grafana-alloy; }; }; @@ -121,7 +120,7 @@ buildGoModule rec { mainProgram = "alloy"; license = licenses.asl20; homepage = "https://grafana.com/oss/alloy"; - maintainers = with maintainers; [ flokli emilylange hbjydev ]; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ azahi flokli emilylange hbjydev ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json new file mode 100644 index 0000000000..5aa4d87333 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.json @@ -0,0 +1,84 @@ +{ + "name": "gramma", + "version": "1.6.0", + "license": "ISC", + "repository": "https://github.com/caderek/gramma", + "homepage": "https://caderek.github.io/gramma/", + "description": "Command line grammar checker", + "main": "src/index.js", + "bin": "src/cli.js", + "exports": { + ".": "./src/index.js", + "./esm": "./bundle/gramma.esm.js", + "./esm-min": "./bundle/gramma.esm.min.js", + "./iife": "./bundle/gramma.min.js" + }, + "types": "src/index.d.ts", + "scripts": { + "build": "rm -rf bin; yarn run build:win64; yarn run build:macos; yarn run build:linux64; yarn run build:zip; yarn run build:bundles", + "build:win64": "pkg -c package.json -t node16-win-x64 --out-path bin/windows64 src/cli.js", + "build:macos": "pkg -c package.json -t node16-macos-x64 --out-path bin/macos src/cli.js", + "build:linux64": "pkg -c package.json -t node16-linux-x64 --out-path bin/linux64 src/cli.js", + "build:bundles": "yarn run build:esm; yarn run build:esm-min; yarn run build:iife", + "build:esm": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.js --format=esm", + "build:esm-min": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.min.js --format=esm --minify", + "build:iife": "esbuild src/index.js --bundle --outfile=bundle/gramma.min.js --format=iife --minify --global-name=gramma", + "build:zip": "node scripts/zipBinaries.js", + "format": "prettier --write \"src/**/*.js\"", + "lint": "eslint src/**", + "test": "jest", + "test:ci": "jest --coverage && cat ./coverage/lcov.info | codacy-coverage", + "check:langs": "node scripts/checkLanguagesSupport.js", + "prepare": "husky install", + "definitions": "tsc" + }, + "keywords": [ + "grammar", + "command-line", + "checker" + ], + "author": "Maciej Cąderek | maciej.caderek@gmail.com", + "dependencies": { + "cli-progress": "^3.9.1", + "decompress": "^4.2.1", + "decompress-unzip": "^4.0.1", + "dotenv": "^10.0.0", + "intercept-stdout": "^0.1.2", + "isomorphic-fetch": "^3.0.0", + "kleur": "^4.1.4", + "portfinder": "^1.0.28", + "progress-stream": "^2.0.0", + "prompts": "^2.4.1", + "query-string": "^7.0.1", + "rimraf": "^3.0.2", + "tcp-port-used": "^1.0.2", + "yargs": "^17.2.1" + }, + "devDependencies": { + "@types/jest": "^27.0.2", + "codacy-coverage": "^3.4.0", + "esbuild": "^0.13.4", + "eslint": "^7.32.0", + "eslint-config-airbnb": "^18.2.1", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-react": "^7.26.1", + "gramma": "^1.5.0", + "husky": "^7.0.0", + "jest": "^27.2.4", + "pkg": "^5.3.3", + "prettier": "^2.4.1", + "shelljs": "^0.8.4", + "typescript": "^4.4.3" + }, + "jest": { + "verbose": true, + "testMatch": [ + "**/?(*.)(spec|test).?(m)js" + ] + }, + "engines": { + "node": ">=12.0.0" + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix new file mode 100644 index 0000000000..d5ba331d00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/gramma/package.nix @@ -0,0 +1,34 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "gramma"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "caderek"; + repo = "gramma"; + rev = "v${version}"; + hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-FuR6wUhAaej/vMgjAlICMEj1pPf+7PFrdu2lTFshIkg="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "command-line grammar checker"; + homepage = "https://caderek.github.io/gramma/"; + changelog = "https://github.com/caderek/gramma/releases/tag/v${version}"; + license = lib.licenses.isc; + mainProgram = "gramma"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json index cd4e46f3fb..c90f63c8c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.6", + "version": "1.3.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.6", + "version": "1.3.9", "hasInstallScript": true, "license": "None", "dependencies": { @@ -197,9 +197,9 @@ } }, "node_modules/ws": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", - "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, diff --git a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix index 7e5b98ebab..3c81f17f01 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-FJaDSg+scrmqYkCGCrb+yT8TtKT09xu6BS5AjTlfhzo="; + hash = "sha256-HbS1hHnlyptXEGy6Qs2Iq/bUUEXYJPc55FEYBjyBvVs="; }; - npmDepsHash = "sha256-WyV0f5thWG7hg7Vm1UUIlcFCgP83HfXQFBUVHcQdjRo="; + npmDepsHash = "sha256-iVDa8Y/32J7qFWp/jlKwNiepmpfUZV56xNwxILUayMo="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix index dd85107893..588e0e45d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.0"; + version = "0.79.1"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw="; + hash = "sha256-Ih1xja20e3wCZ68kRA9bK8jh+pw/5KtlgeE3dDjqeE0="; # 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-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw="; + vendorHash = "sha256-iSpSJwAHB/HJ3Ut1VgUBd1yCwOaM4f3ihR0J4YjMVxM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix index a3d5b88687..2d42ed3924 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/handlr-regex/package.nix @@ -1,19 +1,31 @@ -{ lib, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }: +{ + lib, + rustPlatform, + fetchFromGitHub, + shared-mime-info, + libiconv, + installShellFiles, + nix-update-script, +}: rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-RCMTRf/mrLCDrmJSAofTgCHKK4GogkdGXnN4lFFQMA8="; + hash = "sha256-6ASljvJF/qbl8nvAZKQ2rQ8CQPovTF7FLKp8enIjIP4="; }; - cargoHash = "sha256-GHRryBeofZQbVTyOwMwYKVAymui8VvsUQhiwGu0+HEE="; + cargoHash = "sha256-4tm7N8l7ScKhhOFxt/1ssArdF9fgvCyrDrBASaiOusI="; + + nativeBuildInputs = [ + installShellFiles + shared-mime-info + ]; - nativeBuildInputs = [ installShellFiles shared-mime-info ]; buildInputs = [ libiconv ]; preCheck = '' @@ -29,6 +41,8 @@ rustPlatform.buildRustPackage rec { installManPage assets/manual/man1/* ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Fork of handlr with support for regex"; homepage = "https://github.com/Anomalocaridid/handlr-regex"; diff --git a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix index fff749ff29..55fc9c9f83 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511"; - hash = "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8="; + rev = "1a4f12ae0bda877ec4099b429cf439aad897d7e9"; + hash = "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/hp/hpp2plantuml/package.nix b/third_party/nixpkgs/pkgs/by-name/hp/hpp2plantuml/package.nix new file mode 100644 index 0000000000..0bb3fe0afd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hp/hpp2plantuml/package.nix @@ -0,0 +1,33 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "hpp2plantuml"; + version = "0.8.5"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + hash = "sha256-PfTJmBypI21AAK3sMojygQfrhnRqcMmVCW4dxGfDfQg="; + }; + + propagatedBuildInputs = with python3Packages; [ + jinja2 + cppheaderparser + ]; + + pythonImportsCheck = [ "hpp2plantuml" ]; + + nativeCheckInputs = with python3Packages; [ pytest ]; + + meta = { + description = "Convert C++ header files to PlantUML"; + homepage = "https://github.com/thibaultmarin/hpp2plantuml"; + license = lib.licenses.mit; + mainProgram = "hpp2plantuml"; + maintainers = with lib.maintainers; [ eymeric ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix index 3d382f0c0a..c9bfb20a3a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/htcondor/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "htcondor"; - version = "23.7.2"; + version = "23.8.1"; src = fetchFromGitHub { owner = "htcondor"; repo = "htcondor"; rev = "v${version}"; - hash = "sha256-U0IeZlDd21RYR9XNoIGPpuwhEL1MfQ9+DDyeX8sLgWM="; + hash = "sha256-ccrc3ykhZQc2ExFKgwk3g5ivqh/fLTM7T9nz2YTMx3Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix index 70feb33d76..3bbd7678c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-QAZP119VOPTnVXe2mtzCpB3OW/g73oA/qwR94OzISKo="; + hash = "sha256-dyiCEWOiUtRppKgpqI68kC7Hv1AMK76kvCEaS8nIIJM="; }; - vendorHash = "sha256-Og7FTCrto1l+Xpfr2zEgg/yXa7dflws0yJ2Xh9f3mbI="; + vendorHash = "sha256-iNI/5uAYMG+bfndpD17dp1v3rGbFdHnG9oQv/grb/XY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix index 2d2ac51f30..4bf253c030 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperlink"; - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { owner = "untitaker"; repo = "hyperlink"; rev = version; - hash = "sha256-ZmNw4NmDD0VWwnmNjxsA4y5gzVbTzshZLRYzaNJ4iGw="; + hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4="; }; - cargoHash = "sha256-5j1Ziwk5uQNIKCRMZpJP4qR0tcyUUvT8i/KZbXq3WzI="; + cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc="; meta = with lib; { description = "Very fast link checker for CI"; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json index ef4aabbe6b..f4a78b0e8b 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { "branch": "main", - "commit_hash": "9e781040d9067c2711ec2e9f5b47b76ef70762b3", - "commit_message": "props: bump version to 0.41.1", - "date": "2024-06-13", - "tag": "v0.41.1" + "commit_hash": "918d8340afd652b011b937d29d5eea0be08467f5", + "commit_message": "flake.lock: update", + "date": "2024-06-25", + "tag": "v0.41.2" } diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix index ae3e38de9a..97b54ffdbf 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix @@ -64,14 +64,14 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hLnnNBWP1Qjs1I3fndMgp8rbWJruxdnGTq77A4Rv4R4="; + hash = "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po="; }; postPatch = '' @@ -186,8 +186,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - wozeparrot fufexan + johnrtitor + wozeparrot ]; mainProgram = "Hyprland"; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprnotify/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprnotify/package.nix new file mode 100644 index 0000000000..3289d6fd0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprnotify/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + alsa-lib +}: + +buildGoModule rec { + pname = "hyprnotify"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "codelif"; + repo = "hyprnotify"; + rev = "v${version}"; + hash = "sha256-dL+W+iMwRNw9042bs2XUFPMCCqIvDENXOMzhcLh+RL4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsa-lib ]; + + vendorHash = "sha256-AZDtaiSNq7em876Q9f+YeDxboqVwA8IE9dDM6zggFXs="; + + meta = { + description = "DBus Implementation of Freedesktop Notification spec for 'hyprctl notify'"; + homepage = "https://github.com/codelif/hyprnotify"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bloeckchengrafik ]; + mainProgram = "hyprnotify"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix index 1ad3a925ff..cc3123cb94 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprutils/package.nix @@ -5,17 +5,18 @@ pkg-config, pixman, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60="; + hash = "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw="; }; nativeBuildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebInfo"; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/hyprwm/hyprutils"; description = "Small C++ library for utilities used across the Hypr* ecosystem"; diff --git a/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix b/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix index 95f0011182..a1eba93894 100644 --- a/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "igir"; - version = "2.7.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-tfwXvLUcueGnImzmfUTV7l00+peLlJsxhreejoSVPPo="; + hash = "sha256-EKY9vzN4JYq+ydcjNZPHSqh5Tf6bLeDh1bwkPw01oK8="; }; - npmDepsHash = "sha256-MpTGG/ySZ6xw+bW+AEFQqEFbN2FutopkLXtx0VlqmjE="; + npmDepsHash = "sha256-7d/aMaKo3gsQ8PI8pSqRrv07k8+xBIpaHL+DPxAGTio="; # I have no clue why I have to do this postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix index cab32531fd..60d19900af 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix @@ -4,7 +4,6 @@ , meta , appimageTools }: -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src meta; - name = "${pname}-${version}"; } diff --git a/third_party/nixpkgs/pkgs/by-name/im/impala/package.nix b/third_party/nixpkgs/pkgs/by-name/im/impala/package.nix index b322e6f0f3..0ae303747b 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/impala/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE="; + hash = "sha256-0ULcknkZKYEvuqlcY8E1kZtpA0lPxxjRV2/zfak+FKU="; }; - cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU="; + cargoHash = "sha256-1jFUfpinqXBu8eTFAA1dRDk1F1IhNjcA7CkJmaIjkFQ="; meta = { description = "TUI for managing wifi"; diff --git a/third_party/nixpkgs/pkgs/by-name/in/ingress2gateway/package.nix b/third_party/nixpkgs/pkgs/by-name/in/ingress2gateway/package.nix new file mode 100644 index 0000000000..90e5a46592 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/ingress2gateway/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ingress2gateway"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+ImMpO1qRkXYLy+MDloKSoDCmMmJSBorgDjzaeSCBdY="; + }; + + vendorHash = "sha256-IEU9cfYCkrQagxzJT6jPz2nRCz1BAaiGvkEPhNRQr4E="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Convert Ingress resources to Gateway API resources "; + homepage = "https://github.com/kubernetes-sigs/ingress2gateway"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + mainProgram = "ingress2gateway"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix index 6edae9b3f5..21de48577d 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix @@ -5,22 +5,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY="; + hash = "sha256-mxZpJMmSCgm5uV5/wknVb1PdxRIF/b2k+6rdOh4b8zA="; }; buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"]; - installPhase = '' - runHook preInstall - install -Dm755 _release/inotify-info $out/bin/inotify-info - runHook postInstall - ''; + installFlags = ["PREFIX=$$out"]; meta = with lib; { description = "Easily track down the number of inotify watches, instances, and which files are being watched"; diff --git a/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix b/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix index 8eae2d9add..c80bf01ab7 100644 --- a/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/je/jellyfin-web/package.nix @@ -27,7 +27,7 @@ let in buildNpmPackage' rec { pname = "jellyfin-web"; - version = "10.9.6"; + version = "10.9.7"; src = assert version == jellyfin.version; @@ -35,10 +35,10 @@ buildNpmPackage' rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-cKMKcT2roah35Pv36KJqYIhwoYXaT1yYfvOsxbt+EfE="; + hash = "sha256-vjp96NTcSY1Uj1PeEOPIdZuMFNcO3ZyjRvYYT0AQCrk="; }; - npmDepsHash = "sha256-9uAFWlbzDzd8f8G/v/eLWJ3Is4aO5mqEd4o/YZXDkTQ="; + npmDepsHash = "sha256-CKUssg4YWZd2Gzz7FtO5zA4ngQeLXkFu0VskXrFNwjM="; npmBuildScript = [ "build:production" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/je/jellyfin/package.nix b/third_party/nixpkgs/pkgs/by-name/je/jellyfin/package.nix index 0360ff53e3..8ab7526eeb 100644 --- a/third_party/nixpkgs/pkgs/by-name/je/jellyfin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.9.6"; # ensure that jellyfin-web has matching version + version = "10.9.7"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "sha256-Ze1KO+Rx4sz8qdKa1U2g096Ck/Qc+JdQj4MNqaJRhb8="; + sha256 = "sha256-jxOFbmYrgxP6jbjnWubajqXInLXu7TO4vssU4E1oeoc="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix index 4962b83aa7..3912f03daf 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jo/job-security/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "job-security"; - version = "unstable-0-2024-03-24"; + version = "0-unstable-2024-04-07"; src = fetchFromGitHub { owner = "yshui"; repo = "job-security"; - rev = "3881a4a0e66afe19cbdba3f43d0f85732796f977"; - hash = "sha256-mXmDzBsHdiim0bWrs0SvgtMZmKnYVz/RV9LNqPHHlnk="; + rev = "9b621cb0be437c709e398d31934b864a09d2a1d5"; + hash = "sha256-KPnLVKz10SuVcG0CCFWxWnjhf9gHHPCRZw6AW9/gAmk="; }; - cargoHash = "sha256-W5evL36ByUUjvSwa3Nmf4MT2oZYoQ8kmchNOxUwmpuE="; + cargoHash = "sha256-YwlI+Z3Zry3i3amz3DufvKzSS1Hrp2kPG76aH5tMJ2g="; meta = { description = "Job control from anywhere"; diff --git a/third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix index 17bda415f9..eb2722b341 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "karmor"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-LdUu56y9jRPFOF/Tfo9GZYmOlZIUs7/byWj2yQw7BE4="; + hash = "sha256-XWht+gCR+BHQwLrQqVdCpgKO+VUC6mxvOlpn9hOjrnE="; }; vendorHash = "sha256-r3Fy4nOjlvyHcvztSfOOE6PmOhhNcVdoIq+ie5jqwkw="; diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix deleted file mode 100644 index f289d19e3e..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "kcl-cli"; - version = "0.8.9"; - src = fetchFromGitHub { - owner = "kcl-lang"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; - }; - vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; - ldflags = [ - "-X=kcl-lang.io/cli/pkg/version.version=${version}" - ]; - subPackages = [ "cmd/kcl" ]; - meta = with lib; { - description = "Command line interface for KCL programming language"; - homepage = "https://github.com/kcl-lang/cli"; - license = licenses.asl20; - maintainers = with maintainers; [ peefy ]; - mainProgram = "kcl"; - }; -} diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix new file mode 100644 index 0000000000..6c02da1f98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kcl/package.nix @@ -0,0 +1,56 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, kclvm_cli +, kclvm +, makeWrapper +, installShellFiles +, +}: +buildGoModule rec { + pname = "kcl"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; + }; + + vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; + + ldflags = [ + "-w -s" + "-X=kcl-lang.io/cli/pkg/version.version=v${version}" + ]; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + buildInputs = [ kclvm kclvm_cli ]; + + subPackages = [ "cmd/kcl" ]; + + # env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29 + postFixup = '' + wrapProgram $out/bin/kcl \ + --set PATH ${lib.makeBinPath [kclvm_cli]} \ + --set KCL_LIB_HOME ${lib.makeLibraryPath [kclvm]} \ + --set KCL_GO_DISABLE_INSTALL_ARTIFACT false \ + ''; + + postInstall = '' + installShellCompletion --cmd kcl \ + --bash <($out/bin/kcl completion bash) \ + --fish <($out/bin/kcl completion fish) \ + --zsh <($out/bin/kcl completion zsh) + ''; + + meta = with lib; { + description = "A command line interface for KCL programming language"; + homepage = "https://github.com/kcl-lang/cli"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + mainProgram = "kcl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/su/surrealist/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock similarity index 53% rename from third_party/nixpkgs/pkgs/by-name/su/surrealist/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock index fe73a7deef..083baa87aa 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surrealist/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/Cargo.lock @@ -18,27 +18,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "1.1.2" +name = "ahash" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +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 = "alloc-no-stdlib" -version = "2.0.4" +name = "always-assert" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127" dependencies = [ - "alloc-no-stdlib", + "log", ] [[package]] @@ -57,62 +62,144 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.79" +name = "anes" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "ascii" -version = "1.1.0" +name = "annotate-snippets" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", + "unicode-width", + "yansi-term", ] [[package]] -name = "atk-sys" -version = "0.15.1" +name = "anstream" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ - "glib-sys", - "gobject-sys", + "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 = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[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.58", +] + +[[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", - "system-deps 6.2.0", + "winapi", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[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", + "cfg-if 1.0.0", "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" @@ -120,10 +207,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "base64" -version = "0.21.6" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +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" @@ -133,15 +229,39 @@ 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" -version = "0.1.6" +name = "bitmaps" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array 0.12.4", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.7", +] [[package]] name = "block-buffer" @@ -149,51 +269,40 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] -name = "brotli" -version = "3.4.0" +name = "block-padding" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" 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", + "byte-tools", ] [[package]] name = "bstr" -version = "1.9.0" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ + "lazy_static", "memchr", - "serde", + "regex-automata 0.1.10", ] [[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" +name = "byte-tools" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" @@ -203,88 +312,27 @@ 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 = "cairo-rs" -version = "0.15.12" +name = "cast" +version = "0.3.0" 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", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] -name = "cesu8" -version = "1.1.0" +name = "cfg-if" +version = "0.1.10" 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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" -dependencies = [ - "smallvec", - "target-lexicon", -] +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" @@ -294,115 +342,179 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "windows-targets 0.48.5", + "wasm-bindgen", + "windows-targets 0.52.4", ] [[package]] -name = "chunked_transfer" -version = "1.5.0" +name = "ciborium" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] [[package]] -name = "cocoa" -version = "0.24.1" +name = "ciborium-io" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +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 2.4.1", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", + "textwrap 0.11.0", + "unicode-width", ] [[package]] -name = "cocoa-foundation" -version = "0.1.2" +name = "clap" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "textwrap 0.16.1", ] [[package]] -name = "color_quant" -version = "1.1.0" +name = "clap" +version = "4.5.4" 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" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "bytes", - "memchr", + "clap_builder", ] [[package]] -name = "convert_case" -version = "0.4.0" +name = "clap_builder" +version = "4.5.2" 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" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "core-foundation-sys", - "libc", + "anstream", + "anstyle", + "clap_lex 0.7.0", + "strsim 0.11.1", ] +[[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 = "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 = "compiler_base_error" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e6a143200e9657a565b093fde64a590af93884d1f820829db6461de1ff0086" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_span", + "fluent", + "pretty_assertions", + "rustc_errors", + "rustc_span", + "termcolor", + "unic-langid", + "walkdir", +] + +[[package]] +name = "compiler_base_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21900034f34b69f860a5ff66e0577b8e66d310090b04bf0334afea9a041e0cee" + +[[package]] +name = "compiler_base_session" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67411f0b5421d9c9f045ec08c4d01fe3861197d11215d1e2e448be663aff9ad9" +dependencies = [ + "anyhow", + "compiler_base_error", + "compiler_base_span", +] + +[[package]] +name = "compiler_base_span" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42aae2adfa4b418441ede52835f3c96e9ca63d595f0ac861d94935757e9cb2e" +dependencies = [ + "rustc_span", +] + +[[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", + "windows-sys 0.52.0", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + [[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 = "cpufeatures" version = "0.2.12" @@ -413,19 +525,82 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "criterion" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ - "cfg-if", + "atty", + "cast", + "clap 2.34.0", + "criterion-plot 0.4.5", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap 3.2.25", + "criterion-plot 0.5.0", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "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 = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -455,86 +630,54 @@ 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", + "generic-array 0.14.7", "typenum", ] [[package]] -name = "cssparser" -version = "0.27.2" +name = "csv" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", + "csv-core", + "itoa", + "ryu", + "serde", ] [[package]] -name = "cssparser-macros" -version = "0.6.1" +name = "csv-core" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ - "quote", - "syn 2.0.48", + "memchr", ] [[package]] -name = "ctor" -version = "0.2.6" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "quote", - "syn 2.0.48", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.48", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.48", + "cfg-if 1.0.0", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", ] [[package]] @@ -544,20 +687,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] -name = "derive_more" -version = "0.99.17" +name = "diff" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", + "generic-array 0.12.4", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.7", ] [[package]] @@ -566,85 +719,105 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "crypto-common", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "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 = "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" +name = "discard" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] -name = "embed-resource" -version = "2.4.1" +name = "displaydoc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml 0.8.8", - "vswhom", - "winreg", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] -name = "embed_plist" -version = "1.2.2" +name = "dissimilar" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] -name = "encoding_rs" -version = "0.8.33" +name = "either" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" dependencies = [ - "cfg-if", + "log", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "enquote" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" +dependencies = [ + "thiserror", +] + +[[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]] @@ -653,6 +826,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +dependencies = [ + "serde", +] + [[package]] name = "errno" version = "0.3.8" @@ -663,30 +845,31 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "expect-test" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0" +dependencies = [ + "dissimilar", + "once_cell", +] + +[[package]] +name = "fancy-regex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" -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", - "rustc_version", -] +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "filetime" @@ -694,42 +877,61 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] [[package]] -name = "flate2" -version = "1.0.28" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" dependencies = [ - "crc32fast", - "miniz_oxide", + "fluent-bundle", + "unic-langid", ] [[package]] -name = "fnv" -version = "1.0.7" +name = "fluent-bundle" +version = "0.15.2" 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" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" dependencies = [ - "foreign-types-shared", + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "fluent-langneg" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +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 = "form_urlencoded" @@ -741,13 +943,43 @@ dependencies = [ ] [[package]] -name = "futf" -version = "0.1.5" +name = "fsevent-sys" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ - "mac", - "new_debug_unreachable", + "libc", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + +[[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]] @@ -757,6 +989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -790,9 +1023,15 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] +[[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" @@ -805,120 +1044,34 @@ 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" +name = "generational-arena" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" dependencies = [ - "byteorder", + "cfg-if 1.0.0", ] [[package]] -name = "gdk" -version = "0.15.4" +name = "generic-array" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" 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", + "typenum", ] [[package]] @@ -933,24 +1086,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -959,81 +1101,6 @@ 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", - "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" @@ -1041,82 +1108,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.14" +name = "half" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" dependencies = [ - "aho-corasick", - "bstr", "log", - "regex-automata 0.4.3", - "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 = "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", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -1148,69 +1166,39 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", + "libc", ] [[package]] -name = "http" -version = "0.2.11" +name = "hermit-abi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "bytes", - "fnv", - "itoa 1.0.10", + "windows-sys 0.52.0", ] [[package]] -name = "http" -version = "1.0.0" +name = "humantime" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.10", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1229,22 +1217,6 @@ 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" @@ -1256,32 +1228,17 @@ dependencies = [ ] [[package]] -name = "ignore" -version = "0.4.22" +name = "im-rc" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.3", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", + "bitmaps", + "rand_core", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", ] [[package]] @@ -1292,27 +1249,78 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", + "rustc-rayon 0.5.0", ] [[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", - "serde", ] [[package]] -name = "infer" -version = "0.13.0" +name = "indoc" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inkwell" +version = "0.2.0" +source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33" dependencies = [ - "cfb", + "either", + "inkwell_internals", + "libc", + "llvm-sys", + "once_cell", + "parking_lot 0.12.1", +] + +[[package]] +name = "inkwell_internals" +version = "0.8.0" +source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[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 = "insta" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "similar", ] [[package]] @@ -1321,96 +1329,629 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", +] + +[[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 = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[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" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "itoa" -version = "1.0.10" +name = "jobserver" +version = "0.1.28" 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" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" 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" +name = "jod-thread" +version = "0.1.2" 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" +checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" [[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" +name = "json-spanned-value" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "bb343fa4e3b1b22b344937deedac88da995abf139c2232cbeaa436c38380a210" dependencies = [ "serde", "serde_json", - "thiserror", - "treediff", ] [[package]] -name = "kuchikiki" -version = "0.8.2" +name = "jsonrpc-core" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "cssparser", - "html5ever", + "futures", + "futures-executor", + "futures-util", + "log", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "jsonrpc-stdio-server" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878586767497326eb3d011bd6dbb583e9f008b11528f82fd47798ec46bb6c26" +dependencies = [ + "futures", + "jsonrpc-core", + "log", + "tokio", + "tokio-util", +] + +[[package]] +name = "kcl-language-server" +version = "0.8.7" +dependencies = [ + "anyhow", + "chrono", + "clap 4.5.4", + "compiler_base_session", + "crossbeam-channel", + "dashmap", + "env_logger", + "im-rc", "indexmap 1.9.3", - "matches", - "selectors", + "kclvm-ast", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-sema", + "kclvm-span", + "kclvm-tools", + "kclvm-utils", + "kclvm-version", + "log", + "lsp-server", + "lsp-types", + "maplit", + "parking_lot 0.12.1", + "proc_macro_crate", + "ra_ap_vfs", + "ra_ap_vfs-notify", + "ropey", + "rustc-hash", + "rustc_lexer", + "salsa", + "serde", + "serde_json", + "threadpool", + "tokio", + "tokio-test", +] + +[[package]] +name = "kclvm" +version = "0.8.7" +dependencies = [ + "kclvm-api", + "kclvm-ast", + "kclvm-cmd", + "kclvm-compiler", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-evaluator", + "kclvm-loader", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-tools", + "kclvm-version", +] + +[[package]] +name = "kclvm-api" +version = "0.8.7" +dependencies = [ + "anyhow", + "criterion 0.4.0", + "futures", + "indexmap 1.9.3", + "jsonrpc-stdio-server", + "kcl-language-server", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-loader", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-tools", + "kclvm-utils", + "maplit", + "once_cell", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "prost-wkt-types", + "protoc-bin-vendored", + "serde", + "serde_json", + "serde_yaml", + "tempfile", + "tokio", +] + +[[package]] +name = "kclvm-ast" +version = "0.8.7" +dependencies = [ + "compiler_base_span", + "kclvm-error", + "kclvm-parser", + "kclvm-span", + "kclvm-utils", + "serde", + "serde_json", + "thread_local", + "uuid", +] + +[[package]] +name = "kclvm-ast-pretty" +version = "0.8.7" +dependencies = [ + "compiler_base_macros", + "compiler_base_session", + "fancy-regex", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-error", + "kclvm-parser", + "pretty_assertions", +] + +[[package]] +name = "kclvm-cmd" +version = "0.8.7" +dependencies = [ + "anyhow", + "clap 4.5.4", + "compiler_base_session", + "kclvm-api", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-runner", + "kclvm-runtime", + "kclvm-tools", + "kclvm-version", +] + +[[package]] +name = "kclvm-compiler" +version = "0.8.7" +dependencies = [ + "ahash", + "bit-set", + "bitflags 1.3.2", + "fancy-regex", + "indexmap 1.9.3", + "inkwell", + "kclvm-ast", + "kclvm-error", + "kclvm-runtime", + "kclvm-sema", + "once_cell", + "phf", + "time 0.2.27", + "unicode_names2", +] + +[[package]] +name = "kclvm-config" +version = "0.8.7" +dependencies = [ + "ahash", + "anyhow", + "chrono", + "dirs", + "glob", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-utils", + "kclvm-version", + "md-5 0.8.0", + "pathdiff", + "regex", + "ron", + "serde", + "serde_json", + "serde_yaml", + "toml", +] + +[[package]] +name = "kclvm-driver" +version = "0.8.7" +dependencies = [ + "anyhow", + "glob", + "kclvm-ast", + "kclvm-config", + "kclvm-parser", + "kclvm-runtime", + "kclvm-utils", + "notify 6.1.1", + "serde", + "serde_json", + "walkdir", +] + +[[package]] +name = "kclvm-error" +version = "0.8.7" +dependencies = [ + "annotate-snippets", + "anyhow", + "atty", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "indexmap 1.9.3", + "kclvm-runtime", + "kclvm-span", + "serde_json", + "termize", + "tracing", +] + +[[package]] +name = "kclvm-evaluator" +version = "0.8.7" +dependencies = [ + "anyhow", + "generational-arena", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-error", + "kclvm-loader", + "kclvm-parser", + "kclvm-runtime", + "kclvm-sema", +] + +[[package]] +name = "kclvm-lexer" +version = "0.8.7" +dependencies = [ + "expect-test", + "kclvm-error", + "rustc_lexer", + "unic-emoji-char", +] + +[[package]] +name = "kclvm-loader" +version = "0.8.7" +dependencies = [ + "anyhow", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-sema", + "maplit", +] + +[[package]] +name = "kclvm-macros" +version = "0.8.7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "kclvm-parser" +version = "0.8.7" +dependencies = [ + "anyhow", + "bstr", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "either", + "enquote", + "expect-test", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-config", + "kclvm-error", + "kclvm-lexer", + "kclvm-sema", + "kclvm-span", + "kclvm-utils", + "num-bigint", + "petgraph", + "regex", + "rustc_lexer", + "serde", + "serde_json", + "tracing", + "unicode_names2", +] + +[[package]] +name = "kclvm-query" +version = "0.8.7" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_session", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-sema", + "maplit", + "pretty_assertions", +] + +[[package]] +name = "kclvm-runner" +version = "0.8.7" +dependencies = [ + "anyhow", + "cc", + "chrono", + "compiler_base_macros", + "compiler_base_session", + "criterion 0.3.6", + "glob", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-compiler", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-evaluator", + "kclvm-parser", + "kclvm-query", + "kclvm-runtime", + "kclvm-sema", + "kclvm-utils", + "kclvm-version", + "libc", + "libloading", + "once_cell", + "serde", + "serde_json", + "tempfile", + "threadpool", + "uuid", + "walkdir", +] + +[[package]] +name = "kclvm-runtime" +version = "0.8.7" +dependencies = [ + "ahash", + "base64", + "bstr", + "chrono", + "fancy-regex", + "generational-arena", + "glob", + "handlebars", + "indexmap 1.9.3", + "itertools", + "kclvm_runtime_internal_macros", + "lazy_static", + "libc", + "md5", + "num-integer", + "phf", + "regex", + "serde", + "serde_json", + "serde_yaml", + "sha1", + "sha2 0.9.9", + "unic-ucd-bidi", + "unic-ucd-category", + "unicode-casing", + "uuid", +] + +[[package]] +name = "kclvm-sema" +version = "0.8.7" +dependencies = [ + "ahash", + "anyhow", + "bit-set", + "bitflags 1.3.2", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "criterion 0.3.6", + "fancy-regex", + "generational-arena", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-runtime", + "kclvm-span", + "kclvm-utils", + "lazy_static", + "once_cell", + "petgraph", + "phf", + "regex", + "serde", + "serde_json", + "suggestions", + "unicode_names2", +] + +[[package]] +name = "kclvm-span" +version = "0.8.7" +dependencies = [ + "compiler_base_span", + "kclvm-macros", + "parking_lot 0.11.2", + "scoped-tls", +] + +[[package]] +name = "kclvm-tools" +version = "0.8.7" +dependencies = [ + "anyhow", + "compiler_base_session", + "compiler_base_span", + "criterion 0.3.6", + "fancy-regex", + "indexmap 1.9.3", + "insta", + "json-spanned-value", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-utils", + "located_yaml", + "once_cell", + "pretty_assertions", + "regex", + "rustc_lexer", + "serde_json", + "serde_yaml", + "walkdir", +] + +[[package]] +name = "kclvm-utils" +version = "0.8.7" +dependencies = [ + "anyhow", + "fslock", + "regex", +] + +[[package]] +name = "kclvm-version" +version = "0.8.7" +dependencies = [ + "vergen", +] + +[[package]] +name = "kclvm_runtime_internal_macros" +version = "0.5.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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]] @@ -1421,35 +1962,68 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "libredox" -version = "0.0.1" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", + "cfg-if 1.0.0", + "winapi", ] [[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.5.0", + "libc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +dependencies = [ + "serde", ] [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "llvm-sys" +version = "120.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624f2692f436769c7eb85a13eeca3f6fb9705a4b2bd0473ac9577c90f19e21ef" +dependencies = [ + "cc", + "lazy_static", + "libc", + "regex", + "semver 0.11.0", +] + +[[package]] +name = "located_yaml" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bc68ee6f87a1be7fdba1dcfd854528371aa84a8390279b5d7a99d5da82add76" +dependencies = [ + "linked-hash-map", + "serde", + "yaml-rust", +] [[package]] name = "lock_api" @@ -1463,62 +2037,40 @@ 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" [[package]] -name = "loom" -version = "0.5.6" +name = "lsp-server" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305" dependencies = [ - "cfg-if", - "generator", - "scoped-tls", + "crossbeam-channel", + "log", "serde", "serde_json", - "tracing", - "tracing-subscriber", ] [[package]] -name = "mac" -version = "0.1.1" +name = "lsp-types" +version = "0.93.2" 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" +checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" dependencies = [ - "libc", + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", ] [[package]] -name = "markup5ever" -version = "0.11.0" +name = "maplit" +version = "1.0.2" 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", -] +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "matches" @@ -1527,95 +2079,125 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] -name = "memchr" -version = "2.7.1" +name = "md-5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "opaque-debug 0.2.3", +] [[package]] -name = "memoffset" -version = "0.9.0" +name = "md-5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "autocfg", + "cfg-if 1.0.0", + "digest 0.10.7", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[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" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", - "simd-adler32", ] [[package]] -name = "ndk" -version = "0.6.0" +name = "mio" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.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 = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "notify" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", ] [[package]] -name = "ndk-context" -version = "0.1.1" +name = "notify" +version = "6.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" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "jni-sys", + "bitflags 2.5.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", ] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" +name = "num-bigint" +version = "0.4.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 = "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-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1623,10 +2205,25 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1637,68 +2234,17 @@ 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" +name = "num_threads" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "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", + "libc", ] [[package]] @@ -1717,44 +2263,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "open" -version = "3.2.0" +name = "oorandom" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "overload" -version = "0.1.1" +name = "opaque-debug" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] -name = "pango" -version = "0.15.10" +name = "opaque-debug" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] -name = "pango-sys" -version = "0.15.10" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[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 = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.0", + "instant", + "lock_api", + "parking_lot_core 0.8.6", ] [[package]] @@ -1764,7 +2310,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -1773,9 +2333,9 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -1793,144 +2353,109 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "phf" -version = "0.8.0" +name = "pest" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "pest_meta" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +dependencies = [ + "once_cell", + "pest", + "sha2 0.10.8", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + +[[package]] +name = "phf" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" +dependencies = [ + "phf_macros", + "phf_shared", "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" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" 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", + "phf_shared", + "rand", ] [[package]] name = "phf_macros" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_generator", + "phf_shared", "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.48", -] - [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.9.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" +checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" dependencies = [ "siphasher", ] [[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" @@ -1939,45 +2464,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.28" +name = "plotters" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ - "base64 0.21.6", - "indexmap 2.1.0", - "line-wrap", - "quick-xml", - "serde", - "time", + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "png" -version = "0.17.10" +name = "plotters-backend" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] -name = "portpicker" -version = "0.1.1" +name = "plotters-svg" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ - "rand 0.8.5", + "plotters-backend", ] [[package]] @@ -1993,43 +2504,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "precomputed-hash" -version = "0.1.1" +name = "pretty_assertions" +version = "1.4.0" 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" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "diff", + "yansi", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" 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]] @@ -2040,22 +2531,167 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +name = "proc_macro_crate" +version = "0.1.0" dependencies = [ - "memchr", + "proc-macro2", + "quote", + "syn 2.0.58", ] +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "prost-wkt" +version = "0.4.1" +dependencies = [ + "chrono", + "inventory", + "prost", + "serde", + "serde_derive", + "serde_json", + "typetag", +] + +[[package]] +name = "prost-wkt-build" +version = "0.4.1" +dependencies = [ + "heck 0.4.1", + "prost", + "prost-build", + "prost-types", + "quote", +] + +[[package]] +name = "prost-wkt-types" +version = "0.4.1" +dependencies = [ + "chrono", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "protoc-bin-vendored", + "regex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "protoc-bin-vendored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d" +dependencies = [ + "protoc-bin-vendored-linux-aarch_64", + "protoc-bin-vendored-linux-ppcle_64", + "protoc-bin-vendored-linux-x86_32", + "protoc-bin-vendored-linux-x86_64", + "protoc-bin-vendored-macos-x86_64", + "protoc-bin-vendored-win32", +] + +[[package]] +name = "protoc-bin-vendored-linux-aarch_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435" + +[[package]] +name = "protoc-bin-vendored-linux-ppcle_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516" + +[[package]] +name = "protoc-bin-vendored-linux-x86_32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0" + +[[package]] +name = "protoc-bin-vendored-linux-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924" + +[[package]] +name = "protoc-bin-vendored-macos-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537" + +[[package]] +name = "protoc-bin-vendored-win32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" + [[package]] name = "quote" version = "1.0.35" @@ -2066,17 +2702,49 @@ dependencies = [ ] [[package]] -name = "rand" -version = "0.7.3" +name = "ra_ap_paths" +version = "0.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "d780b450680460bd7ea3e2483dcf15a3ac0ce0ec028696caa342c577d65e5506" + +[[package]] +name = "ra_ap_stdx" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d776542bf771f4fdf40c21ced864bf213924d8a60d580c970715818471ebd74c" dependencies = [ - "getrandom 0.1.16", + "always-assert", "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", + "miow", + "winapi", +] + +[[package]] +name = "ra_ap_vfs" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cd60adecd0947e1dd41a3077713381aa0cdcba6dc8777300d7d5b83b9fbe84" +dependencies = [ + "fst", + "indexmap 1.9.3", + "ra_ap_paths", + "ra_ap_stdx", + "rustc-hash", +] + +[[package]] +name = "ra_ap_vfs-notify" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a680f2dbd796844ebeaa2a4d01ae209f412ddc2981f6512ab8bc9b471156e6cd" +dependencies = [ + "crossbeam-channel", + "jod-thread", + "notify 5.2.0", + "ra_ap_paths", + "ra_ap_vfs", + "tracing", + "walkdir", ] [[package]] @@ -2086,18 +2754,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]] @@ -2107,16 +2765,7 @@ 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", + "rand_core", ] [[package]] @@ -2125,32 +2774,46 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.5.1", + "rand_core", ] [[package]] -name = "rand_pcg" -version = "0.2.1" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "rand_core 0.5.1", + "either", + "rayon-core", ] [[package]] -name = "raw-window-handle" -version = "0.5.2" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] [[package]] name = "redox_syscall" @@ -2163,25 +2826,25 @@ dependencies = [ [[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.12", + "getrandom", "libredox", "thiserror", ] [[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 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax", ] [[package]] @@ -2189,55 +2852,43 @@ name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] [[package]] name = "regex-automata" -version = "0.4.3" +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 = "ron" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" 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", + "base64", + "bitflags 1.3.2", + "serde", +] + +[[package]] +name = "ropey" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5" +dependencies = [ + "smallvec", + "str_indices", ] [[package]] @@ -2246,22 +2897,141 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-rayon" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246" +dependencies = [ + "crossbeam-deque", + "either", + "rustc-rayon-core 0.3.2", +] + +[[package]] +name = "rustc-rayon" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb81aadc8837ca6ecebe0fe1353f15df83b3b3cc2cf7a8afd571bc22aa121710" +dependencies = [ + "either", + "rustc-rayon-core 0.5.0", +] + +[[package]] +name = "rustc-rayon-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "rustc-rayon-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67668daaf00e359c126f6dcb40d652d89b458a008c8afa727a42a2d20fca0b7f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rustc_data_structures" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38bae9c6afa27015bcaa2869e03bb111ecf0d0e0edc2da559a91d4057174c9a" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "cfg-if 0.1.10", + "ena", + "indexmap 1.9.3", + "jobserver", + "libc", + "memmap2", + "parking_lot 0.12.1", + "rustc-hash", + "rustc-rayon 0.3.2", + "rustc-rayon-core 0.3.2", + "stable_deref_trait", + "tempfile", + "tracing", + "winapi", +] + +[[package]] +name = "rustc_errors" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00299b1841816d2c41129e6d4f86b0b446ee387e8203871c2551e1c405b1243c" +dependencies = [ + "termcolor", + "winapi", +] + +[[package]] +name = "rustc_lexer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "rustc_span" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043e9cc06c53de1f6a125e41e4b915d23a130241610a114ad4fe4f654617eae4" +dependencies = [ + "cfg-if 0.1.10", + "md-5 0.10.6", + "rustc_data_structures", + "scoped-tls", + "sha-1", + "sha2 0.10.8", + "tracing", + "unicode-width", +] + +[[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", + "semver 1.0.22", ] [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2270,21 +3040,44 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] -name = "safemem" -version = "0.3.3" +name = "salsa" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" +dependencies = [ + "crossbeam-utils", + "indexmap 1.9.3", + "lock_api", + "log", + "oorandom", + "parking_lot 0.11.2", + "rustc-hash", + "salsa-macros", + "smallvec", +] + +[[package]] +name = "salsa-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "same-file" @@ -2308,144 +3101,162 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "selectors" -version = "0.22.0" +name = "self_cell" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" 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", + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", ] [[package]] name = "semver" -version = "1.0.21" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "serde", + "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "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.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] -name = "serde_derive" -version = "1.0.195" +name = "serde_cbor" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half 1.8.3", + "serde", +] + +[[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.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "itoa 1.0.10", + "itoa", "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.48", + "syn 2.0.58", ] [[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +name = "serde_yaml" +version = "0.9.34+deprecated" dependencies = [ + "anyhow", + "indexmap 2.2.6", + "indoc", + "itoa", + "ryu", "serde", + "serde_derive", + "unsafe-libyaml", ] [[package]] -name = "serde_with" -version = "3.4.0" +name = "sha-1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "base64 0.21.6", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.1.0", - "serde", - "serde_json", - "serde_with_macros", - "time", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", ] [[package]] -name = "serde_with_macros" -version = "3.4.0" +name = "sha1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.48", + "sha1_smol", ] [[package]] -name = "serialize-to-javascript" -version = "0.1.1" +name = "sha1_smol" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" +name = "sha2" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" 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", + "block-buffer 0.9.0", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.9.0", + "opaque-debug 0.3.1", ] [[package]] @@ -2454,25 +3265,25 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.10.7", ] [[package]] -name = "sharded-slab" -version = "0.1.7" +name = "signal-hook-registry" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ - "lazy_static", + "libc", ] [[package]] -name = "simd-adler32" -version = "0.3.7" +name = "similar" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "siphasher" @@ -2480,6 +3291,16 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] + [[package]] name = "slab" version = "0.4.9" @@ -2491,36 +3312,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 = "soup2" -version = "0.2.1" +name = "socket2" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" 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", + "windows-sys 0.52.0", ] [[package]] @@ -2530,40 +3333,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "state" +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 = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "loom", -] - -[[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", + "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 = "str_indices" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" + [[package]] name = "strsim" version = "0.10.0" @@ -2571,13 +3403,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "surrealist" -version = "0.0.0" +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "suggestions" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5441c382482e49aaac2c3ea9cbcd24290531246e879ee94af5dfc4b144f11e80" dependencies = [ - "portpicker", - "tauri", - "tauri-build", - "tauri-plugin-localhost", + "strsim 0.10.0", ] [[package]] @@ -2593,9 +3430,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2603,380 +3440,132 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "5.0.0" +name = "synstructure" +version = "0.12.6" 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.6", - "heck 0.4.1", - "pkg-config", - "toml 0.8.8", - "version-compare 0.1.1", -] - -[[package]] -name = "tao" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "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" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[package]] -name = "tauri" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af" -dependencies = [ - "anyhow", - "cocoa", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.1", - "http 0.2.11", - "ignore", - "objc", - "once_cell", - "open", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "rfd", - "semver", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "state", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", -] - -[[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.6", - "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-localhost" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#c00b00a93cf78e4f1b45c80e1761fcaba7603330" -dependencies = [ - "http 1.0.0", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "tiny_http", -] - -[[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.11", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158" -dependencies = [ - "cocoa", - "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db" -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", + "unicode-xid", ] [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[package]] -name = "tendril" -version = "0.4.3" +name = "termcolor" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ - "futf", - "mac", - "utf-8", + "winapi-util", ] [[package]] -name = "thin-slice" +name = "termize" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" +checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[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.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[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", + "cfg-if 1.0.0", "once_cell", ] [[package]] -name = "time" -version = "0.3.31" +name = "threadpool" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[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 0.1.1", + "version_check", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa", + "libc", + "num-conv", + "num_threads", "powerfmt", "serde", "time-core", - "time-macros", + "time-macros 0.2.17", ] [[package]] @@ -2987,23 +3576,54 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", "time-core", ] [[package]] -name = "tiny_http" -version = "0.12.0" +name = "time-macros-impl" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ - "ascii", - "chunked_transfer", - "httpdate", - "log", + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.109", +] + +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", ] [[package]] @@ -3023,14 +3643,70 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", + "libc", + "mio", "num_cpus", + "parking_lot 0.12.1", "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.58", +] + +[[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.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]] @@ -3042,65 +3718,6 @@ 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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.21.0", -] - -[[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.1.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" -dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "tracing" version = "0.1.40" @@ -3120,7 +3737,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3130,45 +3747,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] -name = "tracing-log" -version = "0.2.0" +name = "type-map" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" 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 = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", + "rustc-hash", ] [[package]] @@ -3178,10 +3765,153 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "unicode-bidi" -version = "0.3.14" +name = "typetag" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[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-emoji-char" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-langid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +dependencies = [ + "unic-langid-impl", + "unic-langid-macros", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +dependencies = [ + "tinystr", +] + +[[package]] +name = "unic-langid-macros" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" +dependencies = [ + "proc-macro-hack", + "tinystr", + "unic-langid-impl", + "unic-langid-macros-impl", +] + +[[package]] +name = "unic-langid-macros-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" +dependencies = [ + "proc-macro-hack", + "quote", + "syn 2.0.58", + "unic-langid-impl", +] + +[[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-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 = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-casing" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623f59e6af2a98bdafeb93fa277ac8e1e40440973001ca15cf4ae1541cd16d56" [[package]] name = "unicode-ident" @@ -3191,18 +3921,42 @@ 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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_names2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d6678d7916394abad0d4b19df4d3802e1fd84abd7d701f39b75ee71b9e8cf1" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" @@ -3217,37 +3971,33 @@ dependencies = [ ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +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 0.2.12", + "getrandom", + "serde", ] [[package]] -name = "valuable" -version = "0.1.0" +name = "vergen" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[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" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if 1.0.0", + "rustc_version 0.4.0", + "rustversion", + "time 0.3.34", +] [[package]] name = "version_check" @@ -3255,42 +4005,16 @@ 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 = "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", ] -[[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" @@ -3299,46 +4023,34 @@ 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", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[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.48", + "syn 2.0.58", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[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", @@ -3346,116 +4058,43 @@ 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.48", + "syn 2.0.58", "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", ] [[package]] -name = "webkit2gtk" -version = "0.18.2" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", + "either", + "home", "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 = "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", + "rustix", ] [[package]] @@ -3489,77 +4128,15 @@ 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", - "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-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.0", + "windows-targets 0.52.4", ] -[[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" @@ -3575,6 +4152,15 @@ dependencies = [ "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" @@ -3590,7 +4176,22 @@ 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.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]] @@ -3610,32 +4211,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 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-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.0", + "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]] @@ -3652,21 +4238,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[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" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -3682,21 +4256,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[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" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -3712,21 +4274,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[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" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -3742,21 +4292,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[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" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -3772,9 +4310,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -3790,21 +4328,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[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" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -3820,95 +4346,30 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] -name = "winnow" -version = "0.5.33" +name = "yaml-rust" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ - "memchr", + "linked-hash-map", ] [[package]] -name = "winreg" -version = "0.51.0" +name = "yansi" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] -name = "wry" -version = "0.24.7" +name = "yansi-term" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" dependencies = [ - "base64 0.13.1", - "block", - "cocoa", - "core-graphics", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http 0.2.11", - "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 = "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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", + "winapi", ] diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/enable_protoc_env.patch b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/enable_protoc_env.patch new file mode 100644 index 0000000000..4d1f2c2cb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/enable_protoc_env.patch @@ -0,0 +1,37 @@ +diff --git a/api/build.rs b/api/build.rs +index 617c1b9a..20d728e3 100644 +--- a/api/build.rs ++++ b/api/build.rs +@@ -5,10 +5,10 @@ use prost_wkt_build::{FileDescriptorSet, Message}; + /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate + /// the corresponding rust source file to the directory src/model + fn main() { +- std::env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); ++ // std::env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); + + let out = PathBuf::from(env::var("OUT_DIR").unwrap()); + let descriptor_file = out.join("kclvm_service_descriptor.bin"); +diff --git b/third-party/prost-wkt/wkt-types/build.rs a/third-party/prost-wkt/wkt-types/build.rs +index e49222d5..a933ddf4 100644 +--- a/third-party/prost-wkt/wkt-types/build.rs ++++ b/third-party/prost-wkt/wkt-types/build.rs +@@ -13,10 +13,10 @@ use regex::Regex; + + fn main() { + //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC +- std::env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); ++ // std::env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); + let dir = PathBuf::from(env::var("OUT_DIR").unwrap()); + process_prost_pbtime(&dir); diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix new file mode 100644 index 0000000000..549de0066c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm/package.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, protobuf +, pkg-config +, +}: +rustPlatform.buildRustPackage rec { + pname = "kclvm"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kcl"; + rev = "v${version}"; + hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + }; + + sourceRoot = "source/kclvm"; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM="; + }; + }; + + nativeBuildInputs = [ pkg-config protobuf ]; + + patches = [ ./enable_protoc_env.patch ]; + + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + meta = with lib; { + description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + homepage = "https://github.com/kcl-lang/kcl"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/Cargo.lock new file mode 100644 index 0000000000..2cc4275a3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "kclvm_cli" +version = "0.8.7" diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch new file mode 100644 index 0000000000..7e8b91d02b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch @@ -0,0 +1,10 @@ +--- /dev/null 2024-03-29 17:01:59.989114590 +0100 ++++ cli/Cargo.lock 2024-04-17 13:27:32.243365234 +0200 +@@ -0,0 +1,7 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "kclvm_cli" ++version = "0.8.7" diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix new file mode 100644 index 0000000000..ad1aecafaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kclvm_cli/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, kclvm +}: +rustPlatform.buildRustPackage rec { + pname = "kclvm_cli"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kcl"; + rev = "v${version}"; + hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + }; + + sourceRoot = "source/cli"; + cargoLock.lockFile = ./Cargo.lock; + cargoPatches = [ ./cargo_lock.patch ]; + + buildInputs = [ kclvm ]; + + meta = with lib; { + description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + homepage = "https://github.com/kcl-lang/kcl"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + mainProgram = "kclvm_cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kitex/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kitex/package.nix index 2890eff5f8..a2d88c0cfb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ki/kitex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-U61n+zaTnABujDSTPcKr4zfMmPVQwxQAotBXZaOVZSo="; + hash = "sha256-eiwOivulPBYEK7Pmztmb2dgUytPT0hZW5BiCpovUZWw="; }; - vendorHash = "sha256-luZH7ynFni5J3CmLRM3jJPshs/u3zahkS1qS2phopLc="; + vendorHash = "sha256-4tOi1BENGNdqo3xG7PnKbIUb/QsUFhm0wDcRYrMGC0M="; subPackages = [ "tool/cmd/kitex" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/kn/knossosnet/package.nix b/third_party/nixpkgs/pkgs/by-name/kn/knossosnet/package.nix index ba4bae3143..e08fc2416a 100644 --- a/third_party/nixpkgs/pkgs/by-name/kn/knossosnet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kn/knossosnet/package.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; rev = "v${version}"; - hash = "sha256-5pHBCqAEuZDt5lIkLlFN2zKRZkRybc3mUMqsTN44EwU="; + hash = "sha256-4GVbwBykagSMGF3TxyZeoRb7Km+yLEMFOO8fCkH3U5A="; }; patches = [ ./targetframework.patch ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix index bd890528c4..b8ae2e0b6e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix @@ -43,13 +43,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.67"; + version = "1.68"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-FqByklvPPwTGPM1r10Ktv3uMnyyiqZ8z/h0m28wVv68="; + sha256 = "sha256-zqRlQ8HgT4fmGHD6uxxa2duZrx9Vhxd+gm1XQ7w9ay0="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix index 0f39d9e204..9a8863a303 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-5x0Zyk4gPMKcZtpgT0QbIm6NeWX+uJwT2NM+yS2oC3o="; + hash = "sha256-mGHSfOW40NTFK1csckSNriCYF2bEQD/M1Zs34i3PptI="; }; vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc="; diff --git a/third_party/nixpkgs/pkgs/by-name/ks/kshutdown/package.nix b/third_party/nixpkgs/pkgs/by-name/ks/kshutdown/package.nix index 48d85e3451..d1483667d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ks/kshutdown/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ks/kshutdown/package.nix @@ -1,24 +1,24 @@ { stdenv , lib , fetchurl -, extra-cmake-modules +, cmake , unzip -, libsForQt5 +, kdePackages }: stdenv.mkDerivation (finalAttrs: { pname = "kshutdown"; - version = "5.91-beta"; + version = "5.92-beta"; src = fetchurl { url = "mirror://sourceforge/project/kshutdown/KShutdown/${finalAttrs.version}/kshutdown-source-${finalAttrs.version}.zip"; - hash = "sha256-gWXpVBhoZ57kaQV1C+xCBYc2gZjzJfFViD/SI9D+BRc="; + hash = "sha256-EYgb2jeUoLNSPFIzlicnrmsccGc1nvoE5iDVt9x83ns="; name = "kshutdown-source-${finalAttrs.version}.zip"; }; - nativeBuildInputs = [ extra-cmake-modules unzip libsForQt5.wrapQtAppsHook ]; + nativeBuildInputs = [ cmake unzip kdePackages.wrapQtAppsHook ]; - buildInputs = with libsForQt5; [ qtbase kxmlgui knotifyconfig kidletime ]; + buildInputs = with kdePackages; [ qtbase kxmlgui knotifyconfig kidletime kstatusnotifieritem ]; meta = with lib; { homepage = "https://kshutdown.sourceforge.io/"; @@ -29,4 +29,3 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; }; }) - diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch index 440c9252a7..1f99a38892 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch @@ -1,5 +1,5 @@ diff --git a/tools/install.pl b/tools/install.pl -index dbeb7c11..06e4c675 100755 +index b7c7adb..a63de58 100644 --- a/tools/install.pl +++ b/tools/install.pl @@ -9,6 +9,7 @@ use Config; @@ -10,7 +10,7 @@ index dbeb7c11..06e4c675 100755 #Vendor dependencies my @vendor_css = ( -@@ -91,32 +92,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { +@@ -90,34 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; } @@ -30,9 +30,11 @@ index dbeb7c11..06e4c675 100755 - -#Check for GhostScript -say("Checking for GhostScript..."); --can_run('gs') -- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; --say("OK!"); +-if ( can_run('gs') ) { +- say("OK!"); +-} else { +- warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; +-} - -#Check for libarchive -say("Checking for libarchive..."); @@ -43,7 +45,7 @@ index dbeb7c11..06e4c675 100755 #Check for PerlMagick say("Checking for ImageMagick/PerlMagick..."); my $imgk; -@@ -136,36 +111,11 @@ if ($@) { +@@ -137,37 +110,11 @@ if ($@) { say("OK!"); } @@ -67,7 +69,8 @@ index dbeb7c11..06e4c675 100755 - say("\r\nObtaining remote Web dependencies...\r\n"); - -- if ( system("npm ci") != 0 ) { +- my $npmcmd = $legacy ? "npm install" : "npm ci"; +- if ( system($npmcmd) != 0 ) { - die "Something went wrong while obtaining node modules - Bailing out."; - } - @@ -80,7 +83,7 @@ index dbeb7c11..06e4c675 100755 make_path getcwd . "/public/css/vendor"; make_path getcwd . "/public/css/webfonts"; make_path getcwd . "/public/js/vendor"; -@@ -212,19 +162,3 @@ sub cp_node_module { +@@ -214,19 +161,3 @@ sub cp_node_module { } diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix index 2a18474e2d..91289c816b 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix @@ -2,7 +2,6 @@ , stdenv , buildNpmPackage , fetchFromGitHub -, fetchpatch , makeBinaryWrapper , perl , ghostscript @@ -11,32 +10,22 @@ buildNpmPackage rec { pname = "lanraragi"; - version = "0.9.0"; + version = "0.9.10"; src = fetchFromGitHub { owner = "Difegue"; repo = "LANraragi"; rev = "v.${version}"; - hash = "sha256-euZotpXTUSmxlA5rbTUhHpHH0Ojd3AZjGasxYZ+L7NY="; + hash = "sha256-mW2cVd+SPbjc/+b0KY3je1eqw5ZT/GKFruE4Y/eFdD4="; }; patches = [ - (fetchpatch { - name = "fix-redis-auth.patch"; - url = "https://github.com/Difegue/LANraragi/commit/1711b39759ad02ab2a8863ce1f35f6479c9a2917.patch"; - hash = "sha256-WfKeieysIlS64qgVEc75JFKjxXuvZN85M6US/gwjTzw="; - }) - (fetchpatch { - name = "fix-ghostscript-device.patch"; - url = "https://github.com/Difegue/LANraragi/commit/087d63b11c89fda8cb3a30cdb2e86ecd6be66bb7.patch"; - hash = "sha256-Cu9d/dDlO0yuFCTKOyg5A0gIuiA+FcWD9PjexB/BK0U="; - }) ./install.patch ./fix-paths.patch ./expose-password-hashing.patch # Used by the NixOS module ]; - npmDepsHash = "sha256-/F/lhQIVGbbFxFuQXXwHUVlV2jhHt0hFf94v0FrTKt8="; + npmDepsHash = "sha256-RAjZGuK0C6R22fVFq82GPQoD1HpRs3MYMluUAV5ZEc8="; nativeBuildInputs = [ perl makeBinaryWrapper ]; @@ -59,6 +48,7 @@ buildNpmPackage rec { MojoliciousPluginTemplateToolkit MojoliciousPluginRenderFile MojoliciousPluginStatus + IOSocketSocks IOSocketSSL CpanelJSONXS Minion @@ -69,9 +59,9 @@ buildNpmPackage rec { FileChangeNotify ModulePluggable TimeLocal - YAMLSyck + YAMLPP StringSimilarity - ] ++ lib.optional stdenv.isLinux LinuxInotify2; + ] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ]; buildPhase = '' runHook preBuild @@ -135,4 +125,3 @@ buildNpmPackage rec { platforms = lib.platforms.unix; }; } - diff --git a/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix index 6f78d0994d..96111365f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lazysql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-yPf9/SM4uET/I8FsDU1le9JgxELu0DR9k7mv8PnBwvQ="; + hash = "sha256-AUu4mKIcwjXlvJSszeuAuPHH3pQs4+LUU6NitVEatnk="; }; vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY="; diff --git a/third_party/nixpkgs/pkgs/by-name/le/leetgo/package.nix b/third_party/nixpkgs/pkgs/by-name/le/leetgo/package.nix index 64d19fda9d..1b2b8e3376 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/leetgo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/leetgo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.1"; + version = "1.4.7"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-LbY7GGPu2ZwcclCmsE9V421FUi+foR7CXyFHF7GrjQo="; + hash = "sha256-K/PaQakX0ZLu2Uh906kZ4p8J+GV7ewAeSVFMMQiKYBA="; }; - vendorHash = "sha256-GG9IfM50uVhsQVjXhUrYxuEbPlbsEsFubmUUSMr5SD4="; + vendorHash = "sha256-4QSfZzYLjPdGKLySP57fK9n6WXdCYzb3sWibfP85jLE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix b/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix new file mode 100644 index 0000000000..6bf32f3394 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lg/lgogdownloader/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + curl, + boost, + liboauth, + jsoncpp, + htmlcxx, + rhash, + tinyxml-2, + help2man, + html-tidy, + libsForQt5, + testers, + lgogdownloader, + + enableGui ? true, +}: + +stdenv.mkDerivation rec { + pname = "lgogdownloader"; + version = "3.14"; + + src = fetchFromGitHub { + owner = "Sude-"; + repo = "lgogdownloader"; + rev = "refs/tags/v${version}"; + hash = "sha256-pxYiSefscglHN53wvp38Ec4/3X46sWc56Y4YKNtqABQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + help2man + html-tidy + ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; + + buildInputs = + [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ] + ++ lib.optionals enableGui [ + libsForQt5.qtbase + libsForQt5.qtwebengine + ]; + + cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; + + passthru.tests = { + version = testers.testVersion { package = lgogdownloader; }; + }; + + meta = { + description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; + mainProgram = "lgogdownloader"; + homepage = "https://github.com/Sude-/lgogdownloader"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ _0x4A6F ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix index a0b559fa31..bc011a3410 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix @@ -5,11 +5,11 @@ buildGoModule rec { pname = "libeduvpn-common"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; - hash = "sha256-hTF9CSqU9c0+TOK+/oRGjY1fBCKpisiiTJnWZqcdvjA="; + hash = "sha256-cD2WqxKCQkDL4lNbFKcbKygvmmd5FT8mZe5DDw+kizg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix index 912953dfb3..e845970a6a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix @@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix index 931c24ad28..4f433e9b6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.05"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-sU95EEsdDXjen7QoBfKdVP3wHD5Ckcw2OOBNCdFFuNY="; + hash = "sha256-BoPyiiR13CQXIFulKN68zEB9pNn6ZRbrS3Wz/3JE6W4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/third_party/nixpkgs/pkgs/by-name/li/libtorrent/package.nix similarity index 63% rename from third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix rename to third_party/nixpkgs/pkgs/by-name/li/libtorrent/package.nix index 7217026dc8..04de15c967 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libtorrent/package.nix @@ -10,17 +10,18 @@ , openssl , pkg-config , zlib +, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rakshasa-libtorrent"; - version = "0.13.8+date=2021-08-07"; + version = "0.13.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; - hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; + rev = "91f8cf4b0358d9b4480079ca7798fa7d9aec76b5"; + hash = "sha256-mEIrMwpWMCAA70Qb/UIOg8XTfg71R/2F4kb3QG38duU="; }; nativeBuildInputs = [ @@ -36,13 +37,15 @@ stdenv.mkDerivation rec { zlib ]; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix b/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix index 19e580df3d..9798bc0d8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/licensure/package.nix @@ -1,10 +1,12 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config , openssl , git , gitls +, darwin }: rustPlatform.buildRustPackage rec { pname = "licensure"; @@ -19,7 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-449p+y7qUcTxBOttyQPt+nRtK+s9HJBoVKGdMQaszLQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl git gitls ]; + buildInputs = [ openssl git gitls ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; checkFlags = [ # Checking for files in the git repo (git ls-files), @@ -33,6 +38,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; mainProgram = "licensure"; maintainers = [ maintainers.soispha ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix new file mode 100644 index 0000000000..a030ea3002 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix @@ -0,0 +1,156 @@ +{ alsa-lib +, boost +, catch2_3 +, cmake +, cryptopp +, cpp-jwt +, doxygen +, enet +, fetchzip +, fetchurl +, fmt +, ffmpeg-headless +, gamemode +, httplib +, inih +, lib +, libGL +, libjack2 +, libpulseaudio +, libunwind +, libusb1 +, nlohmann_json +, openal +, openssl +, pipewire +, pkg-config +, portaudio +, sndio +, spirv-tools +, soundtouch +, stdenv +, vulkan-headers +, vulkan-loader +, xorg +, zstd +, enableSdl2Frontend ? true , SDL2 +, enableQt ? true , kdePackages +, enableQtTranslations ? enableQt +, enableCubeb ? true , cubeb +, useDiscordRichPresence ? false , rapidjson +}: let + compat-list = fetchurl { + name = "lime3ds-compat-list"; + url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/b0c8b6b80d716db6b957ba103c7a9e17ead24d55/compatibility_list.json"; + hash = "sha256-2wNqtorcQo3o09tisikW+cj6cVLLQEiJ1Zcai5ptGEU="; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "lime3ds"; + version = "2114"; + + src = fetchzip { + url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; + hash = "sha256-PGrKh10dBFAWn37G8m/2/ymqcgtAuxB+5Xib0FI+IMQ="; + }; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ] ++ lib.optionals enableQt [kdePackages.wrapQtAppsHook]; + + buildInputs = [ + alsa-lib + boost + catch2_3 + cryptopp + cpp-jwt + enet + fmt + ffmpeg-headless + httplib + inih + libGL + libjack2 + libpulseaudio + libunwind + libusb1 + nlohmann_json + openal + openssl + pipewire + portaudio + SDL2 + soundtouch + sndio + spirv-tools + vulkan-headers + xorg.libX11 + xorg.libXext + zstd + ] ++ lib.optionals enableQt (with kdePackages; [ + qtbase + qtmultimedia + qttools + qtwayland + ]) ++ lib.optionals enableQtTranslations [kdePackages.qttools] + ++ lib.optionals enableCubeb [cubeb] + ++ lib.optional useDiscordRichPresence rapidjson; + + postPatch = '' + # Fix file not found when looking in var/empty instead of opt + mkdir externals/dynarmic/src/dynarmic/ir/var + ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty + + # Prep compatibilitylist + rm ./dist/compatibility_list/compatibility_list.json + ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json + + # We already know the submodules are present + substituteInPlace CMakeLists.txt \ + --replace-fail "check_submodules_present()" "" + + # Add gamemode + substituteInPlace externals/gamemode/include/gamemode_client.h \ + --replace-fail "libgamemode.so.0" "${lib.getLib gamemode}/lib/libgamemode.so.0" + ''; + + postInstall = let + libs = lib.makeLibraryPath [ vulkan-loader ]; + in lib.optionalString enableSdl2Frontend '' + for binfile in lime3ds-gui lime3ds-cli lime3ds-room + do + wrapProgram "$out/bin/$binfile" \ + --prefix LD_LIBRARY_PATH : ${libs} + '' + lib.optionalString enableQt '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${libs} + ) + done + ''; + + cmakeFlags = with lib; [ + (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (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 "CITRA_ENABLE_COMPATIBILITY_REPORTING" true) + (cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) + (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) + (cmakeBool "ENABLE_CUBEB" enableCubeb) + (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ]; + + meta = with lib; { + description = "A Nintendo 3DS emulator based on Citra"; + homepage = "https://github.com/Lime3DS/Lime3DS"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ arthsmn ]; + mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix b/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix index f313ab8086..4402cad981 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.7.2"; + version = "7.8.0"; in # 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. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # 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-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE="; + sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix index 74bc3b03e6..3d7584b864 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-i6G221n6wIOYo//+w/4XN4QpTkt7AYwAw6RBYo66vXI="; + hash = "sha256-fJpW85bYV6Jl7EoyXsJdr4hUqBntMzBnJfTO316/En0="; }; - vendorHash = "sha256-7MPjhjTIO7ZKKyc0Du8+0F+8PvpiwiIBMnXZiYX2XyI="; + vendorHash = "sha256-V8kHIzIZj07B1N2KBGICIFF7aRFl2oynMIZUPeotCs8="; subPackages = [ "cmd/server" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix index d39007f9ef..eec7878794 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY="; + hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo"; }; nativeBuildInputs = [ meson diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix index 2e5514dd15..254f8c2a51 100644 --- a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix @@ -122,12 +122,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ - ( - with cudaPackages.flags; - cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - builtins.concatStringsSep ";" (map dropDot cudaCapabilities) - ) - ) + (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] ++ optionals rocmSupport [ (cmakeFeature "CMAKE_C_COMPILER" "hipcc") diff --git a/third_party/nixpkgs/pkgs/by-name/lo/loopwm/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/loopwm/package.nix new file mode 100644 index 0000000000..5b1829a8ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lo/loopwm/package.nix @@ -0,0 +1,40 @@ +{ + stdenvNoCC, + lib, + fetchurl, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "loopwm"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/MrKai77/Loop/releases/download/${finalAttrs.version}/Loop.zip"; + hash = "sha256-1DQ6O6QkD04/meS0XaS0+vpr+vd5cfwGSehV8QVgYtI="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r Loop.app $out/Applications + runHook postInstall + ''; + + meta = { + description = "macOS Window management made elegant"; + homepage = "https://github.com/MrKai77/Loop"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/lo/louvre/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/louvre/package.nix index 5b7ad4a2f6..668e1e2d1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/louvre/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/louvre/package.nix @@ -22,9 +22,9 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.1.0-1"; + version = "2.2.0-1"; rev = "v${self.version}"; - hash = "sha256-qRvAryZ6SIhh5yDugcosVYOM2Tq0XPuaA6ib8/jWxNI="; + hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix b/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix index a7ecd6c0f3..99a7438256 100644 --- a/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lp/lpairs2/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lpairs2"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz"; - hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; + hash = "sha256-ES5RGr817vc8t2DFNeETTqrm0uwk3JuTypSZjXK86Bg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix index 8ff8671f5c..0590cb37de 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.10"; + version = "3.2.11"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-XsHMe4+TeTowxnMRby4W44YRa3Q/OgDf2QOVMjPel4wy3O9TSfNBTzpP7NM07BKVDmNJ7GJrF8WMXewfT3YU8g=="; + hash = "sha512-qRucW9x4LMmTb8pw0zY1EKXkPfjdahCi2PN/bfdB8CYA4wZp0bfZNaGtPpI/BKPlnR/nfpypEdnHsoqlL9KiCg=="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix b/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix index c9c657bee3..83c1fbf89a 100644 --- a/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lwgrp"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "LLNL"; repo = "lwgrp"; rev = "v${version}"; - hash = "sha256-f0tYn9FbrOz8iMoG8Is8vYDNfYHTfxLKNnyxJA+Msdk="; + hash = "sha256-ZpxxcCqK+qdvnCvobeBV6htRF8wThiQgVFYgEigqmIE="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 53ac9fa3bf..77b7e00b06 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -14,10 +14,6 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; in effectiveStdenv.mkDerivation (finalAttrs: { pname = "fastdeploy-ppocr"; @@ -65,7 +61,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix new file mode 100644 index 0000000000..b39590b645 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix @@ -0,0 +1,49 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + procps, +}: +python3Packages.buildPythonApplication rec { + pname = "mackup"; + version = "0.8.40"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lra"; + repo = "mackup"; + rev = "refs/tags/${version}"; + hash = "sha256-hAIl9nGFRaROlt764IZg4ejw+b1dpnYpiYq4CB9dJqQ="; + }; + + postPatch = '' + substituteInPlace mackup/utils.py \ + --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' + ''; + + nativeBuildInputs = with python3Packages; [ + poetry-core + pythonRelaxDepsHook + nose + ]; + + propagatedBuildInputs = with python3Packages; [ + six + docopt + ]; + + pythonImportsCheck = [ "mackup" ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "A tool to keep your application settings in sync (OS X/Linux)"; + changelog = "https://github.com/lra/mackup/releases/tag/${version}"; + license = lib.licenses.agpl3Only; + homepage = "https://github.com/lra/mackup"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "mackup"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix index cc53732ae3..c571e198c6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "makejinja"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "mirkolenz"; repo = "makejinja"; - rev = "v${version}"; - hash = "sha256-sH4m+rcHA6nW21xEJon10lS7e5QiFwUyvV49NZ3UY+s="; + rev = "refs/tags/v${version}"; + hash = "sha256-F56y+TxDD/B67ncnBTOd0FZGmXO/zjXitwbk/5aiekM="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/malwoverview/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/malwoverview/package.nix index 4028ae8fac..853aeab3bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/malwoverview/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/malwoverview/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "malwoverview"; - version = "5.4.4"; + version = "5.4.5"; pyproject = true; src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; rev = "refs/tags/v${version}"; - hash = "sha256-eP2xYd/S/c4Z/cdK8IWghEUyF7pSTb5Cpg5pS/tpzUI="; + hash = "sha256-8miPlWBQSOf153l70C4Ya7gWF6D/gTArzJ5FyR0nVwA="; }; pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ma/markdown-link-check/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/markdown-link-check/package.nix new file mode 100644 index 0000000000..cfcb6689ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/markdown-link-check/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "markdown-link-check"; + version = "3.12.2"; + + src = fetchFromGitHub { + owner = "tcort"; + repo = "markdown-link-check"; + rev = "v${version}"; + hash = "sha256-xeqvKPIJUDNEX9LdXpxoA7ECjGlfp/wwlCw/USZN47c="; + }; + + npmDepsHash = "sha256-J11NJRmXg2tj5BqGSQ8bMRJQUOCOZ9dEfa4Gzrf38t4="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Checks all of the hyperlinks in a markdown text to determine if they are alive or dead"; + mainProgram = "markdown-link-check"; + homepage = "https://github.com/tcort/markdown-link-check"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcontrolcenter/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcontrolcenter/package.nix new file mode 100644 index 0000000000..1b128387f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcontrolcenter/package.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, libsForQt5, makeDesktopItem, copyDesktopItems, fetchFromGitHub, cmake, kmod }: + +stdenv.mkDerivation (finalAttrs: { + pname = "mcontrolcenter"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "dmitry-s93"; + repo = "MControlCenter"; + rev = finalAttrs.version; + hash = "sha256-SV78OVRGzy2zFLT3xqeUtbjlh81Z97PVao18P3h/8dI="; + }; + + postPatch = '' + substituteInPlace src/helper/helper.cpp \ + --replace-fail "/usr/sbin/modprobe" "${kmod}/bin/modprobe" + substituteInPlace src/helper/mcontrolcenter.helper.service \ + --replace-fail "/usr" "$out" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "MControlCenter"; + exec = "mcontrolcenter"; + icon = "mcontrolcenter"; + comment = finalAttrs.meta.description; + desktopName = "MControlCenter"; + categories = [ "System" ]; + }) + ]; + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + copyDesktopItems + cmake + ]; + + buildInputs = [ + libsForQt5.qtbase + kmod + ]; + + installPhase = '' + runHook preInstall + install -Dm755 mcontrolcenter $out/bin/mcontrolcenter + install -Dm755 helper/mcontrolcenter-helper $out/libexec/mcontrolcenter-helper + install -Dm644 ../resources/mcontrolcenter.svg $out/share/icons/hicolor/scalable/apps/mcontrolcenter.svg + install -Dm644 ../src/helper/mcontrolcenter-helper.conf $out/share/dbus-1/system.d/mcontrolcenter-helper.conf + install -Dm644 ../src/helper/mcontrolcenter.helper.service $out/share/dbus-1/system-services/mcontrolcenter.helper.service + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/dmitry-s93/MControlCenter"; + description = "Tool to change the settings of MSI laptops running Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.Tommimon ]; + mainProgram = "mcontrolcenter"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix index 581b37dcde..d0df9a933e 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.04"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; + hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix index 5c943e7137..6f66934fd0 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-06-18"; + version = "0.9.5-unstable-2024-06-24"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "cbb0f4b872ea8a5e2348c7f1a22695056968192f"; - hash = "sha256-J1i7+VrOVQruHFhzjBnSf+DbmIa3o+rWISsdm8kMRC8="; + rev = "db20771ef36bfa5bc0dc624cf245844507724107"; + hash = "sha256-XGDMA+0IOvl1UN2HgfLikpxHXl/p0z+Yv6fJs5xv08Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix index b66483d29a..7e2f34ed57 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-HHErk1KX8HgAt4UrBuchK6ysNsxEsrf5uBzzvSNz+to="; + hash = "sha256-HqeF/Wr5ngf6hpFrZAL8kdHcMuxUslWsjtlOq4+C48s="; }; sourceRoot = "${src.name}/caddy"; - vendorHash = "sha256-aO0EvxZNOCAaqEWN1VIdPpS+y8KcsuXo7o8msicspNE="; + vendorHash = "sha256-mRyzih46M635uQ9kIQ1vIe/ToN92xlvUcxQ7Bw/Qxiw="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/disable-tests-that-require-network-access.patch b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/disable-tests-that-require-network-access.patch new file mode 100644 index 0000000000..8dd88e0b72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/disable-tests-that-require-network-access.patch @@ -0,0 +1,57 @@ +From 5a886abd956607503e9dc7cd22923eaf8b01e46f Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Mon, 3 Jun 2024 20:31:27 +0300 +Subject: [PATCH] Disable tests that require network access. + +--- + tests/integration/meson.build | 2 -- + tests/libutils/test.cpp | 20 -------------------- + 2 files changed, 22 deletions(-) + +diff --git a/tests/integration/meson.build b/tests/integration/meson.build +index da1b3b76..8908e690 100644 +--- a/tests/integration/meson.build ++++ b/tests/integration/meson.build +@@ -51,8 +51,6 @@ wrap_files = files( + 'wrap-test/vorbis.wrap', + ) + +-test('wrap-test', wrap_tester, args: [wrap_files], timeout: 200000) +- + partial_interpreter_tests = [ + [ + 'foreach', +diff --git a/tests/libutils/test.cpp b/tests/libutils/test.cpp +index 2b20191c..c313312b 100644 +--- a/tests/libutils/test.cpp ++++ b/tests/libutils/test.cpp +@@ -131,26 +131,6 @@ TEST(UtilsTest, testMergingDirectories) { + ASSERT_EQ('a', std::ifstream(outputDir / "i1/a.txt").get()); + } + +-TEST(UtilsTest, testDownloadAndExtraction) { +- auto zipFileName = std::filesystem::path{randomFile() + "-1"}; +- auto result = downloadFile( +- "https://github.com/JCWasmx86/mesonlsp/archive/refs/heads/main.zip", +- zipFileName); +- ASSERT_TRUE(result); +- auto directoryName = std::filesystem::path{randomFile() + "-2"}; +- std::filesystem::create_directory(directoryName); +- result = extractFile(zipFileName, directoryName); +- ASSERT_TRUE(result); +- auto mustExist = +- directoryName / "mesonlsp-main/Benchmarks/extract_git_data.sh"; +- ASSERT_TRUE(std::filesystem::exists(mustExist)); +- auto mustFailFilename = std::filesystem::path{randomFile() + "-3"}; +- result = +- downloadFile("lnfvwoefvnwefvwvipwnefv2efvpov2nvov", mustFailFilename); +- ASSERT_FALSE(result); +- ASSERT_FALSE(std::filesystem::exists(mustFailFilename)); +-} +- + int main(int argc, char **argv) { + testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +-- +2.45.1 + diff --git a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix new file mode 100644 index 0000000000..8b525a5f57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/package.nix @@ -0,0 +1,170 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + gtest, + makeWrapper, + meson, + ninja, + pkg-config, + python3, + + curl, + libarchive, + libossp_uuid, + libpkgconf, + libuuid, + nlohmann_json, + pkgsStatic, + + mesonlsp, + nix-update-script, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mesonlsp"; + version = "4.2.2"; + + src = fetchFromGitHub { + owner = "JCWasmx86"; + repo = "mesonlsp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-pN8MCqrRfVpmM8KWa7HPTghoegplM4bP/HRVJVs05iE="; + }; + + patches = [ + ./disable-tests-that-require-network-access.patch + ./simplify-the-format-header-polyfill.patch + ]; + + nativeBuildInputs = [ + gtest + makeWrapper + meson + ninja + pkg-config + python3 + ]; + + buildInputs = + [ + curl + libarchive + libpkgconf + nlohmann_json + ] + ++ lib.optionals stdenv.isDarwin [ + libossp_uuid + pkgsStatic.fmt + ] + ++ lib.optionals stdenv.isLinux [ libuuid ]; + + mesonFlags = [ "-Dbenchmarks=false" ]; + + mesonCheckFlags = [ "--print-errorlogs" ]; + + doCheck = true; + + postUnpack = + let + ada = fetchFromGitHub { + owner = "ada-url"; + repo = "ada"; + rev = "v2.7.4"; + hash = "sha256-V5LwL03x7/a9Lvg1gPvgGipo7IICU7xyO2D3GqP6Lbw="; + }; + + muon = fetchFromGitHub { + owner = "JCWasmx86"; + repo = "muon"; + rev = "62af239567ec3b086bae7f02d4aed3a545949155"; + hash = "sha256-k883mKwuP35f0WtwX8ybl9uYbvA3y6Vxtv2EJMpZDEs="; + }; + + sha256 = fetchFromGitHub { + owner = "amosnier"; + repo = "sha-2"; + rev = "49265c656f9b370da660531db8cc6bf0a2e110a6"; + hash = "sha256-X9M/ZATYXUiE4oGorPBnsdaKnKaObarnMRh6QEfkBls="; + }; + + tomlplusplus = fetchFromGitHub { + owner = "marzer"; + repo = "tomlplusplus"; + rev = "v3.4.0"; + hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; + }; + + tree-sitter = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter"; + rev = "v0.20.8"; + hash = "sha256-278zU5CLNOwphGBUa4cGwjBqRJ87dhHMzFirZB09gYM="; + }; + + tree-sitter-ini = fetchFromGitHub { + owner = "JCWasmx86"; + repo = "tree-sitter-ini"; + rev = "20aa563306e9406ac55babb4474521060df90a30"; + hash = "sha256-1hHjtghBIf7lOPpupT1pUCZQCnzUi4Qt/yHSCdjMhCU="; + }; + + tree-sitter-meson = fetchFromGitHub { + owner = "JCWasmx86"; + repo = "tree-sitter-meson"; + rev = "09665faff74548820c10d77dd8738cd76d488572"; + hash = "sha256-ice2NdK1/U3NylIQDnNCN41rK/G6uqFOX+OeNf3zm18="; + }; + in + '' + ( + cd "$sourceRoot/subprojects" + + cp -R --no-preserve=mode,ownership ${ada} ada + cp "packagefiles/ada/meson.build" ada + + cp -R --no-preserve=mode,ownership ${muon} muon + + cp -R --no-preserve=mode,ownership ${sha256} sha256 + cp "packagefiles/sha256/meson.build" sha256 + + cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus-3.4.0 + + cp -R --no-preserve=mode,ownership ${tree-sitter} tree-sitter-0.20.8 + cp "packagefiles/tree-sitter-0.20.8/meson.build" tree-sitter-0.20.8 + + cp -R --no-preserve=mode,ownership ${tree-sitter-ini} tree-sitter-ini + cp "packagefiles/tree-sitter-ini/meson.build" tree-sitter-ini + + cp -R --no-preserve=mode,ownership ${tree-sitter-meson} tree-sitter-meson + cp "packagefiles/tree-sitter-meson/meson.build" tree-sitter-meson + ) + ''; + + postPatch = '' + substituteInPlace subprojects/muon/include/compilers.h \ + --replace-fail 'compiler_language new' 'compiler_language new_' + + patchShebangs src/libtypenamespace + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = mesonlsp; + version = "v${finalAttrs.version}"; + }; + }; + + meta = with lib; { + description = "An unofficial, unendorsed language server for Meson written in C++"; + homepage = "https://github.com/JCWasmx86/mesonlsp"; + changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Plus; + mainProgram = "mesonlsp"; + maintainers = with maintainers; [ paveloom ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch new file mode 100644 index 0000000000..df7972f073 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch @@ -0,0 +1,47 @@ +From ae3fb8943dd5b2d282a2c6d4525a8ce0dd0244e8 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Tue, 25 Jun 2024 23:03:50 +0300 +Subject: [PATCH] Simplify the `` header polyfill. + +--- + src/polyfill/polyfill.hpp | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/src/polyfill/polyfill.hpp b/src/polyfill/polyfill.hpp +index 5c5ba39a..b5d145ed 100644 +--- a/src/polyfill/polyfill.hpp ++++ b/src/polyfill/polyfill.hpp +@@ -1,9 +1,6 @@ + #pragma once + + #if defined(__APPLE__) +-#if __has_include() and !defined(__x86_64__) +-#include +-#else + #include + #include + +@@ -23,10 +20,8 @@ struct fmt::formatter> { + return fmt::format_to(ctx.out(), "{}", tp.time_since_epoch().count()); + } + }; +-#endif +-#else ++#elif defined(_WIN32) + #include +-#ifdef _WIN32 + template <> struct std::formatter { + constexpr auto parse(format_parse_context &ctx) { return ctx.begin(); } + +@@ -35,6 +30,6 @@ template <> struct std::formatter { + return std::format_to(ctx.out(), L"{}", str); + } + }; +- +-#endif ++#else ++#include + #endif +-- +2.45.1 + diff --git a/third_party/nixpkgs/pkgs/by-name/mi/millipixels/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/millipixels/package.nix index 26c275fc5d..27c24c5e93 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/millipixels/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/millipixels/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , glib , meson , ninja @@ -32,6 +33,13 @@ stdenv.mkDerivation rec { domain = "source.puri.sm"; hash = "sha256-pRREQRYyD9+dpRvcfsNiNthFy08Yeup9xDn+x+RWDrE="; }; + patches = [ + # fix for https://source.puri.sm/Librem5/millipixels/-/issues/87, can be removed with the next release (if there ever will be one) + (fetchpatch { + url = "https://source.puri.sm/Librem5/millipixels/-/commit/5a0776993051a0af54c148702f36dbbf1064b917.patch?merge_request_iid=105"; + hash = "sha256-OdjTFHMx64eb94/kSCaxeM/Ju/JxOPoorw2ogwTPP3s="; + }) + ]; nativeBuildInputs = [ glib diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix index af841bb43b..c93a20453b 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/darwin.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-OakGB5Fz1Tlxa/Uu7xHlKoEF9VRfWFQ9CjsR0eCRyQw="; + hash = "sha256-N4+WDXhu62QUFqdCcPPfYEOd2OImg/Moj+UT0xK2oGE="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix index f86aee30bf..43f59abd1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/linux.nix @@ -13,7 +13,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-aPutbJthUhZtBYkYuUB5v88OdhOrcnqw4AhnepfO1B4="; + sha256 = "sha256-wnqCKnZKt0Fj8TasdRVzI558W7aIB5FLkcDEiZfz3ZQ="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix index eeb1b0688d..0b7a2e1d87 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.1.4"; + version = "5.1.6"; meta = with lib; { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/Cargo.lock new file mode 100644 index 0000000000..edc87e0238 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -0,0 +1,5046 @@ +# 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 = "accelerate-src" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" + +[[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", + "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 = "akin" +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" +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.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" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[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.66", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[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 = "autocfg" +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" +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 = "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.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 = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + +[[package]] +name = "bit_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" + +[[package]] +name = "bitstream-io" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" + +[[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 = "buildstructor" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3907aac66c65520545ae3cb3c195306e20d5ed5c90bfbb992e061cf12a104d0" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "str_inflector", + "syn 2.0.66", + "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" +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 = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "candle-core" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "accelerate-src", + "byteorder", + "candle-kernels", + "candle-metal-kernels", + "cudarc", + "gemm", + "half", + "intel-mkl-src", + "libc", + "memmap2", + "metal", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-flash-attn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "anyhow", + "bindgen_cuda", + "candle-core", + "half", +] + +[[package]] +name = "candle-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "bindgen_cuda", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "metal", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-nn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "accelerate-src", + "candle-core", + "candle-metal-kernels", + "half", + "intel-mkl-src", + "metal", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[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" +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 = "cfgrammar" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec07af28018dd8b4b52e49eb6e57268b19dda0996d4824889eb07ee0ef67378c" +dependencies = [ + "indexmap", + "lazy_static", + "num-traits", + "regex", + "serde", + "vob", +] + +[[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 = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "clap" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cli-table" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +dependencies = [ + "cli-table-derive", + "csv", + "termcolor", + "unicode-width", +] + +[[package]] +name = "cli-table-derive" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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 = "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 = "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-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" +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 = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "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 = "cudarc" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89df33b4eb35d6d3f19ce8015fda23079131afef42cf6ede03e961ab8aeb29af" +dependencies = [ + "half", + "libloading", +] + +[[package]] +name = "darling" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbffa8f8e38810422f320ca457a93cf1cd0056dc9c06c556b867558e0d471463" +dependencies = [ + "darling_core 0.11.0", + "darling_macro 0.11.0", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e172685d94b7b83800e3256a63261537b9d6129e10f21c8e13ddf9dba8c64d" +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.66", +] + +[[package]] +name = "darling_macro" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0618ac802792cebd1918ac6042a6ea1eeab92db34b35656afaa577929820788" +dependencies = [ + "darling_core 0.11.0", + "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.66", +] + +[[package]] +name = "defmac" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aafbece59594ed57696a1a69e8bb3ca1683fbc9cdb41d5c02726070b2cd8f19d" + +[[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.66", +] + +[[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_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.9", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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.66", +] + +[[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 = "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" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "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.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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 = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[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 = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[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 = "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 = "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 = "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 = "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.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 = "galil-seiferas" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794ac25cfda3fa11d2b07ff8c65889c6c03411646df54e59e606878d899e1d5a" +dependencies = [ + "defmac", + "unchecked-index", +] + +[[package]] +name = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.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 = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", +] + +[[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 = "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 = "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 = "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 = "httparse" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[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-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "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.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", + "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_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 = "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 = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +dependencies = [ + "byteorder-lite", + "thiserror", +] + +[[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", + "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", + "rayon", + "unicode-width", +] + +[[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 = "intel-mkl-src" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee70586cd5b3e772a8739a1bd43eaa90d4f4bf0fb2a4edc202e979937ee7f5e" +dependencies = [ + "anyhow", + "intel-mkl-tool", + "ocipkg", +] + +[[package]] +name = "intel-mkl-tool" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887a16b4537d82227af54d3372971cfa5e0cde53322e60f57584056c16ada1b4" +dependencies = [ + "anyhow", + "log", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[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.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.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" +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 = "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.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.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[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", + "libc", +] + +[[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.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 = "lrtable" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fcefc5628209d1b1f4b2cd0bcefd0e50be80bdf178e886cb07317f5ce4f2856" +dependencies = [ + "cfgrammar", + "fnv", + "num-traits", + "sparsevec", + "vob", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maybe-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" +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", + "stable_deref_trait", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" +dependencies = [ + "serde", +] + +[[package]] +name = "minijinja-contrib" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ee37078c98d31e510d6a7af488031a2c3ccacdb76c5c4fc98ddfe6d0e9da07" +dependencies = [ + "minijinja", + "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.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", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mistralrs" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "either", + "image", + "indexmap", + "mistralrs-core", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-bench" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "clap", + "cli-table", + "either", + "mistralrs-core", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] +name = "mistralrs-core" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "akin", + "anyhow", + "async-trait", + "bindgen_cuda", + "buildstructor", + "bytemuck", + "candle-core", + "candle-flash-attn", + "candle-nn", + "cfgrammar", + "chrono", + "clap", + "derive-new", + "derive_more", + "dirs", + "either", + "futures", + "galil-seiferas", + "half", + "hf-hub", + "image", + "indexmap", + "indicatif", + "intel-mkl-src", + "itertools 0.13.0", + "lrtable", + "minijinja", + "minijinja-contrib", + "mistralrs-vision", + "once_cell", + "pyo3", + "radix_trie", + "rand", + "rand_isaac", + "range-checked", + "rayon", + "regex-automata 0.4.7", + "rustc-hash", + "serde", + "serde_json", + "strum", + "thiserror", + "tokenizers", + "tokio", + "tokio-rayon", + "toml", + "tqdm", + "tracing", + "tracing-subscriber", + "variantly", + "vob", +] + +[[package]] +name = "mistralrs-pyo3" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "base64 0.22.1", + "candle-core", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "pyo3", + "pyo3-build-config", + "reqwest", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-server" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "anyhow", + "axum", + "base64 0.22.1", + "candle-core", + "clap", + "ctrlc", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "once_cell", + "reqwest", + "serde", + "serde_json", + "tokio", + "tower-http", + "tracing", + "utoipa", + "utoipa-swagger-ui", +] + +[[package]] +name = "mistralrs-vision" +version = "0.1.18" +dependencies = [ + "candle-core", + "image", +] + +[[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 2.0.66", +] + +[[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 = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[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 = "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 = "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-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" +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", + "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", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "memchr", +] + +[[package]] +name = "oci-spec" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +dependencies = [ + "derive_builder", + "getset", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ocipkg" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb3293021f06540803301af45e7ab81693d50e89a7398a3420bdab139e7ba5e" +dependencies = [ + "base16ct", + "base64 0.22.1", + "chrono", + "directories", + "flate2", + "lazy_static", + "log", + "oci-spec", + "regex", + "serde", + "serde_json", + "sha2", + "tar", + "thiserror", + "toml", + "ureq", + "url", + "uuid 1.8.0", + "walkdir", +] + +[[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.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 = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "packedvec" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde3c690ec20e4a2b4fb46f0289a451181eb50011a1e2acc8d85e2fde9062a45" +dependencies = [ + "num-traits", + "serde", +] + +[[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 = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[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 = "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.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 = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +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.66", +] + +[[package]] +name = "pulp" +version = "0.18.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "pyo3" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +dependencies = [ + "anyhow", + "cfg-if", + "chrono", + "chrono-tz", + "either", + "eyre", + "hashbrown", + "indexmap", + "indoc", + "libc", + "memoffset", + "num-bigint", + "num-complex", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "rust_decimal", + "serde", + "smallvec", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.66", +] + +[[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 = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[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.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_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[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-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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[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 = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" +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", + "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.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "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", +] + +[[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 = "rust-embed" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.66", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +dependencies = [ + "sha2", + "walkdir", +] + +[[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.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "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 = "safetensors" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.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.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 = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[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_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_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", + "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 = "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" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "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 = "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 = "sparsevec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35df5d2e580b29f3f7ec5b4ed49b0ab3acf7f3624122b3e823cafb9630f293b8" +dependencies = [ + "num-traits", + "packedvec", + "serde", + "vob", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "str_inflector" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0b848d5a7695b33ad1be00f84a3c079fe85c9278a325ff9159e6c99cef4ef7" +dependencies = [ + "lazy_static", + "regex", +] + +[[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.66", +] + +[[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.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 = "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.66", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.5.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[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", + "version-compare", +] + +[[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 = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "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 = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokenizers" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.4", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[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.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-rayon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf33a76e0b1dd03b778f83244137bd59887abf25c0e87bc3e7071105f457693" +dependencies = [ + "rayon", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-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.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.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "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", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.5.0", + "bytes", + "http", + "http-body", + "http-body-util", + "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-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tqdm" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2d2932240205a99b65f15d9861992c95fbb8c9fb280b3a1f17a92db6dc611f" +dependencies = [ + "anyhow", + "crossterm", + "once_cell", +] + +[[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.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-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 = "try_match" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61ae3c1941e8859e30d28e572683fbfa89ae5330748b45139aedf488389e2be4" +dependencies = [ + "try_match_inner", +] + +[[package]] +name = "try_match_inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a91713132798caecb23c977488945566875e7b61b902fb111979871cbff34e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unchecked-index" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[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 = "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 = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[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", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utoipa" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" +dependencies = [ + "indexmap", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.66", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e" +dependencies = [ + "axum", + "mime_guess", + "regex", + "reqwest", + "rust-embed", + "serde", + "serde_json", + "url", + "utoipa", + "zip", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "variantly" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a332341ba79a179d9e9b33c0d72fbf3dc2c80e1be79416401a08d2b820ef56" +dependencies = [ + "Inflector", + "darling 0.11.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "uuid 0.8.2", +] + +[[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 = "vob" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c058f4c41e71a043c67744cb76dcc1ae63ece328c1732a72489ccccc2dec23e6" +dependencies = [ + "num-traits", + "rustc_version", + "serde", +] + +[[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 = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +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 = "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-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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "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.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[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.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 = "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.66", + "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.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap", + "num_enum", + "thiserror", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix new file mode 100644 index 0000000000..4c5324e8d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/mistral-rs/package.nix @@ -0,0 +1,201 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + python3, + + # buildInputs + oniguruma, + openssl, + mkl, + stdenv, + darwin, + + # env + fetchurl, + + testers, + mistral-rs, + + cudaPackages, + cudaCapability ? null, + + config, + # one of `[ null false "cuda" "mkl" "metal" ]` + acceleration ? null, + +}: + +let + accelIsValid = builtins.elem acceleration [ + null + false + "cuda" + "mkl" + "metal" + ]; + + cudaSupport = + assert accelIsValid; + (acceleration == "cuda") || (config.cudaSupport && acceleration == null); + + minRequiredCudaCapability = "6.1"; # build fails with 6.0 + inherit (cudaPackages.cudaFlags) cudaCapabilities; + cudaCapabilityString = + if cudaCapability == null then + (builtins.head ( + (builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities) + ++ [ + (lib.warn "mistral-rs doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability) + ] + )) + else + 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)); + + darwinBuildInputs = + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreVideo + CoreGraphics + ] + ++ lib.optionals metalSupport [ + MetalKit + MetalPerformanceShaders + ]; +in + +rustPlatform.buildRustPackage rec { + pname = "mistral-rs"; + version = "0.1.18"; + + src = fetchFromGitHub { + owner = "EricLBuehler"; + repo = "mistral.rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc="; + "range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + python3 + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + + buildInputs = + [ + oniguruma + openssl + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvrtc + cudaPackages.libcublas + cudaPackages.libcurand + ] + ++ lib.optionals mklSupport [ mkl ] + ++ lib.optionals stdenv.isDarwin darwinBuildInputs; + + cargoBuildFlags = + lib.optionals cudaSupport [ "--features=cuda" ] + ++ lib.optionals mklSupport [ "--features=mkl" ] + ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; + + env = + { + SWAGGER_UI_DOWNLOAD_URL = + let + # When updating: + # - Look for the version of `utopia-swagger-ui` at: + # https://github.com/EricLBuehler/mistral.rs/blob/v/mistralrs-server/Cargo.toml + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 + swaggerUiVersion = "5.17.12"; + + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; + }; + in + "file://${swaggerUi}"; + + RUSTONIG_SYSTEM_LIBONIG = true; + } + // (lib.optionalAttrs cudaSupport { + CUDA_COMPUTE_CAP = cudaCapability'; + + # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation. + CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; + }); + + NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ + "-I${lib.getDev cudaPackages.cuda_cudart}/include" + "-I${lib.getDev cudaPackages.cuda_cccl}/include" + ]; + + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.config}/release/build/ + ''; + + # Try to access internet + checkFlags = [ + "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_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" + ]; + + 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"; }; + }; + }; + + meta = { + description = "Blazingly fast LLM inference"; + homepage = "https://github.com/EricLBuehler/mistral.rs"; + changelog = "https://github.com/EricLBuehler/mistral.rs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "mistralrs-server"; + platforms = + if cudaSupport then + lib.platforms.linux + else if metalSupport then + [ "aarch64-darwin" ] + else + lib.platforms.unix; + broken = mklSupport; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 121d9072ab..7814ec363d 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -15,7 +15,8 @@ jq, libsoup, moreutils, - nodePackages, + pnpm_8, + nodejs, openssl, pkg-config, webkitgtk, @@ -51,7 +52,7 @@ rustPlatform.buildRustPackage { cacert jq moreutils - nodePackages.pnpm + pnpm_8 ]; # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 @@ -77,7 +78,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cargo-tauri desktop-file-utils - nodePackages.pnpm + pnpm_8 + nodejs pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mods/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mods/package.nix index 8f3b3b7822..abad5bc7b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mods/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mods/package.nix @@ -1,6 +1,7 @@ { lib, buildGoModule, + installShellFiles, fetchFromGitHub, gitUpdater, testers, @@ -9,16 +10,20 @@ buildGoModule rec { pname = "mods"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-MlFWYoSyk1i2uaD04chajsxKlRMtRceJOCrADMrEL60="; + hash = "sha256-s2yzrOfZievm7t9NzHojVDNpHkQdZsqdq7zJNO7/SM8="; }; - vendorHash = "sha256-bfo91VGwLvCGS+BSfe+9/voTFfG4lMOOfK72gSLyv9c="; + vendorHash = "sha256-Q+lpf35tAIZSHV8FBmYrgKbg5RTJzS33Zv8AH9bVxLY="; + + nativeBuildInputs = [ + installShellFiles + ]; ldflags = [ "-s" @@ -41,11 +46,22 @@ buildGoModule rec { }; }; + postInstall = '' + export HOME=$(mktemp -d) + $out/bin/mods man > mods.1 + $out/bin/mods completion bash > mods.bash + $out/bin/mods completion fish > mods.fish + $out/bin/mods completion zsh > mods.zsh + + installManPage mods.1 + installShellCompletion mods.{bash,fish,zsh} + ''; + meta = with lib; { description = "AI on the command line"; homepage = "https://github.com/charmbracelet/mods"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya caarlos0 ]; mainProgram = "mods"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix index d09ef06864..1c57db66fb 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.32.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-0cidxsr7mZLtEMSXc+ZFH9l3pXNi4Fyv27XDks+th/I="; + hash = "sha256-pKq4Vw7vPoT76OvCAeh+XEwI5klz2LPxXAWsr+RsTeU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix rename to third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix index 00dce959fb..fe11f1ef56 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mongodb-compass/package.nix @@ -1,39 +1,39 @@ { -alsa-lib, -at-spi2-atk, -at-spi2-core, -atk, -cairo, -cups, -curl, -dbus, -dpkg, -expat, -fetchurl, -fontconfig, -freetype, -gdk-pixbuf, -glib, -gtk3, -lib, -libdrm, -libnotify, -libsecret, -libuuid, -libxcb, -libxkbcommon, -mesa, -nspr, -nss, -pango, -stdenv, -systemd, -wrapGAppsHook3, -xorg, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + curl, + dbus, + dpkg, + expat, + fetchurl, + fontconfig, + freetype, + gdk-pixbuf, + glib, + gtk3, + lib, + libdrm, + libnotify, + libsecret, + libuuid, + libxcb, + libxkbcommon, + mesa, + nspr, + nss, + pango, + stdenv, + systemd, + wrapGAppsHook3, + xorg, }: let - version = "1.43.0"; + version = "1.43.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,20 +82,25 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-hzPhF0NGwv+Lm+q5SoS8qv10UmuKf4RarGMkEeCxp9w="; + hash = "sha256-idOFt60MlspB8Bm9HbLAhd/F1zhkHSVmdTxvCsgjGvk="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; - # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it - # Feel free to make a PR adding support if desired + # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it + # Feel free to make a PR adding support if desired -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "mongodb-compass"; inherit version; inherit src; - buildInputs = [ dpkg wrapGAppsHook3 gtk3 ]; + buildInputs = [ + dpkg + wrapGAppsHook3 + gtk3 + ]; dontUnpack = true; buildCommand = '' @@ -127,12 +132,12 @@ in stdenv.mkDerivation { wrapGAppsHook $out/bin/mongodb-compass ''; - meta = with lib; { + meta = { description = "GUI for MongoDB"; - maintainers = with maintainers; [ bryanasdev000 ]; + maintainers = with lib.maintainers; [ bryanasdev000 ]; homepage = "https://github.com/mongodb-js/compass"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.sspl; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.sspl; platforms = [ "x86_64-linux" ]; mainProgram = "mongodb-compass"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mosdns/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mosdns/package.nix new file mode 100644 index 0000000000..e38eea0285 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mosdns/package.nix @@ -0,0 +1,53 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + mosdns, + stdenv, + installShellFiles, +}: + +buildGoModule rec { + pname = "mosdns"; + version = "5.3.1"; + + src = fetchFromGitHub { + owner = "IrineSistiana"; + repo = "mosdns"; + rev = "refs/tags/v${version}"; + hash = "sha256-QujkDx899GAImEtQE28ru7H0Zym5SYXJbJEfSBkJYjo="; + }; + + vendorHash = "sha256-0J5hXb1W8UruNG0KFaJBOQwHl2XiWg794A6Ktgv+ObM="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd mosdns \ + --bash <($out/bin/mosdns completion bash) \ + --fish <($out/bin/mosdns completion fish) \ + --zsh <($out/bin/mosdns completion zsh) + ''; + + passthru.tests = { + version = testers.testVersion { + package = mosdns; + command = "${lib.getExe mosdns} version"; + }; + }; + + meta = { + description = "Modular, pluggable DNS forwarder"; + homepage = "https://github.com/IrineSistiana/mosdns"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "mosdns"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix index 22b9b21341..8dfcb9627f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix @@ -38,13 +38,13 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Ai82d1VwtAlKmM8N/hazMWsn5F6HS4I1do3VkpLPlBo="; + hash = "sha256-VshDFHDCfemHS/TN5qEe8CGizZksf44xENSmvX44uAc="; }; php = php.buildEnv ({ @@ -67,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-1sQm+eRrs9m52CepPXahsOJhyLZ68+FIDNHyY33IoD4="; + vendorHash = "sha256-nxbsw0re/7zKhpWxtA8JAf7JL3RLghqaYsi4rkM6VZg="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix index cf06aba555..bdaec94e66 100644 --- a/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-qCquagxj31ih0r5kE4x/jsIBI+KBgrMa3HcBGuhlufk="; + hash = "sha256-Zr9mC/klhyef6xYV8EyoNfM1h4Z0WDtg+OdaarLDBAM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix index 2753d50edb..c1a95ca0b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.2.5"; + version = "1.2.9"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-K+19Ez+uSxa2pf59msdYl33HHIj55znsBMSEvF9JeoI="; + hash = "sha256-dble78oGZ7xJhopLQVgXHvKRJBShnshp2jHxNzmzLDE="; }; - npmDepsHash = "sha256-5Ma2+DrX3z/sdvBwnXtRAfLTOmoPtiEeMyYfAUf2/9o="; + npmDepsHash = "sha256-Hr4Zs2c2+7bOFfVPWkpc1Aw8DLz+ue9A1WW9nXlpBPo="; dontNpmInstall = true; diff --git a/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix new file mode 100644 index 0000000000..8e0bb92906 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/n8/n8n/package.nix @@ -0,0 +1,99 @@ +{ + stdenv, + lib, + nixosTests, + fetchFromGitHub, + nodejs, + pnpm, + python3, + nodePackages, + cacert, + xcbuild, + libkrb5, + libmongocrypt, + postgresql, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "n8n"; + version = "1.46.0"; + + src = fetchFromGitHub { + owner = "n8n-io"; + repo = "n8n"; + rev = "n8n@${finalAttrs.version}"; + hash = "sha256-9T/x2k7XIO+PV0olTQhb4WF1congTbXFvHqaxoaNbp4="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-oldvZC0B/r3fagI5hCn16wjQsD9n4q9foo73lJBJXeU="; + }; + + nativeBuildInputs = [ + pnpm.configHook + python3 # required to build sqlite3 bindings + nodePackages.node-gyp # required to build sqlite3 bindings + cacert # required for rustls-native-certs (dependency of turbo build tool) + makeWrapper + ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; + + buildInputs = [ + nodejs + libkrb5 + libmongocrypt + postgresql + ]; + + buildPhase = '' + runHook preBuild + + pushd node_modules/sqlite3 + node-gyp rebuild + popd + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{lib,bin} + cp -r {packages,node_modules} $out/lib + + makeWrapper $out/lib/packages/cli/bin/n8n $out/bin/n8n \ + --set N8N_RELEASE_TYPE "stable" + + runHook postInstall + ''; + + # makes libmongocrypt bindings not look for static libraries in completely wrong places + BUILD_TYPE = "dynamic"; + + passthru = { + tests = nixosTests.n8n; + }; + + dontStrip = true; + + meta = with lib; { + description = "Free and source-available fair-code licensed workflow automation tool"; + longDescription = '' + Free and source-available fair-code licensed workflow automation tool. + Easily automate tasks across different services. + ''; + homepage = "https://n8n.io"; + changelog = "https://github.com/n8n-io/n8n/releases/tag/${finalAttrs.src.rev}"; + maintainers = with maintainers; [ + freezeboy + gepbird + k900 + ]; + license = licenses.sustainableUse; + mainProgram = "n8n"; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix index e1ad7fb280..5e79e29ee4 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.377"; + version = "0.0.380"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-GQPur1Rc0o7WyCNwXLiu7w3sntQQ/B7WhKHCKVmqH/8="; + hash = "sha256-DAOSkWT+fe0av0EpjK8HxgIei6urgFJrNeMdZfrDqDM="; }; - vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw="; + vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator-out.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator-out.nix new file mode 100644 index 0000000000..a9e179d902 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator-out.nix @@ -0,0 +1,59 @@ +{ stdenv +, cmake +, python3 +, writeTextFile +, protobuf +, src +, version +}: +let + pyproject_toml = writeTextFile { + name = "pyproject.toml"; + text = '' + [build-system] + requires = ["setuptools"] + build-backend = "setuptools.build_meta" + + [tool.setuptools] + include-package-data = true + + [tool.setuptools.packages.find] + where = ["src"] + + [tool.setuptools.package-data] + "*" = ["nanopb.proto"] + + [project] + name = "nanopb" + version = "${version}" + dependencies = [ + "setuptools", + "protobuf", + "six" + ] + ''; + }; +in +stdenv.mkDerivation { + pname = "nanopb-generator-out"; + inherit src version; + + nativeBuildInputs = [ cmake protobuf python3 ]; + + cmakeFlags = [ + "-Dnanopb_BUILD_RUNTIME=OFF" + "-Dnanopb_BUILD_GENERATOR=ON" + "-Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages" + ]; + + preConfigure = '' + cmakeFlags+=" -Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages" + ''; + + postInstall = '' + rm -rf $out/include + rm -rf $out/lib/cmake + ln -s $out/lib/python/site-packages $out/src + ln -s ${pyproject_toml} $out/pyproject.toml + ''; +} diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator.nix new file mode 100644 index 0000000000..15d4e0605b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/generator.nix @@ -0,0 +1,27 @@ +{ python3 +, stdenvNoCC +, protobuf +, version +, generator-out +}: +stdenvNoCC.mkDerivation { + pname = "nanopb-generator"; + inherit version; + + dontUnpack = true; + + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + + propagatedBuildInputs = [ + protobuf + python3.pkgs.nanopb-proto + ]; + + installPhase = '' + mkdir -p $out/bin + cp ${generator-out}/bin/protoc-gen-nanopb $out/bin/ + cp ${generator-out}/bin/nanopb_generator $out/bin/ + wrapPythonPrograms + cp ${generator-out}/bin/nanopb_generator.py $out/bin/ + ''; +} diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix new file mode 100644 index 0000000000..bd14e9d8c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/package.nix @@ -0,0 +1,122 @@ +{ stdenvNoCC +, callPackage +, fetchFromGitHub +, buildPackages +, lib +, enableMalloc ? false +, noPackedStructs ? false +, maxRequiredFields ? null +, field32bit ? false +, noErrmsg ? false +, bufferOnly ? false +, systemHeader ? null +, without64bit ? false +, encodeArraysUnpacked ? false +, convertDoubleFloat ? false +, validateUtf8 ? false +, littleEndian8bit ? false +, c99StaticAssert ? false +, noStaticAssert ? false +}: +stdenvNoCC.mkDerivation (self: +let + generator-out = buildPackages.callPackage ./generator-out.nix { inherit (self) src version; }; + python-module = buildPackages.callPackage ./python-module.nix { + inherit (self) version; + inherit (self.passthru) generator-out; + }; + python3 = buildPackages.python3.override { + packageOverrides = _: _: { + nanopb-proto = self.passthru.python-module; + }; + }; + generator = buildPackages.callPackage ./generator.nix { + inherit python3; + inherit (self) version; + inherit (self.passthru) generator-out; + }; + runtime = callPackage ./runtime.nix { + inherit python3; + inherit (self) src version; + inherit + enableMalloc + noPackedStructs + maxRequiredFields + field32bit + noErrmsg + bufferOnly + systemHeader + without64bit + encodeArraysUnpacked + convertDoubleFloat + validateUtf8 + littleEndian8bit + c99StaticAssert + noStaticAssert; + }; +in +{ + pname = "nanopb"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "nanopb"; + repo = "nanopb"; + rev = self.version; + hash = "sha256-LfARVItT+7dczg2u08RlXZLrLR7ScvC44tgmcy/Zv48="; + }; + + dontPatch = true; + dontUnpack = true; + + propagatedNativeBuildInputs = [ generator ]; + + propagatedBuildInputs = [ runtime ]; + + postInstall = '' + mkdir $out + ln -s ${generator}/bin $out/bin + ln -s ${runtime}/include $out/include + ln -s ${runtime}/lib $out/lib + mkdir -p $out/share/nanopb/generator/proto + ln -s ${self.src}/generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto + ''; + + passthru = { + inherit runtime generator-out python-module generator; + tests = { + simple-proto2 = callPackage ./test-simple-proto2 { }; + simple-proto3 = callPackage ./test-simple-proto3 { }; + message-with-annotations = callPackage ./test-message-with-annotations { }; + message-with-options = callPackage ./test-message-with-options { }; + }; + }; + + meta = with lib; { + platforms = platforms.all; + + description = "Protocol Buffers with small code size"; + homepage = "https://jpa.kapsi.fi/nanopb/"; + license = licenses.zlib; + maintainers = with maintainers; [ kalbasit liarokapisv ]; + + longDescription = '' + Nanopb is a small code-size Protocol Buffers implementation in ansi C. It + is especially suitable for use in microcontrollers, but fits any memory + restricted system. + + - Homepage: jpa.kapsi.fi/nanopb + - Documentation: jpa.kapsi.fi/nanopb/docs + - Downloads: jpa.kapsi.fi/nanopb/download + - Forum: groups.google.com/forum/#!forum/nanopb + + In order to use the nanopb options in your proto files, you'll need to + tell protoc where to find the nanopb.proto file. + You can do so with the --proto_path (-I) option to add the directory + ''${nanopb}/share/nanopb/generator/proto like so: + + protoc --proto_path=. --proto_path=''${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=''${nanopb}/bin/protoc-gen-nanopb --nanopb_out=out file.proto + ''; + }; +}) + diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/python-module.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/python-module.nix new file mode 100644 index 0000000000..f58c955307 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/python-module.nix @@ -0,0 +1,16 @@ +{ python3 +, version +, generator-out +}: +python3.pkgs.buildPythonPackage { + pname = "nanopb-python-module"; + inherit version; + src = generator-out; + pyproject = true; + pythonImportsCheck = [ "nanopb" ]; + propagatedBuildInputs = with python3.pkgs; [ + setuptools + protobuf + six + ]; +} diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanopb/runtime.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/runtime.nix new file mode 100644 index 0000000000..2af7d2cedd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/runtime.nix @@ -0,0 +1,69 @@ +{ cmake +, lib +, stdenv +, protobuf +, python3 +, src +, version +, enableMalloc +, noPackedStructs +, maxRequiredFields +, field32bit +, noErrmsg +, bufferOnly +, systemHeader +, without64bit +, encodeArraysUnpacked +, convertDoubleFloat +, validateUtf8 +, littleEndian8bit +, c99StaticAssert +, noStaticAssert +}: + +stdenv.mkDerivation + ({ + pname = "nanopb-runtime"; + inherit src version; + + nativeBuildInputs = [ cmake protobuf python3 ]; + + patchPhase = + let + compile_definitions = target: '' + target_compile_definitions(${target} + PUBLIC + ${lib.concatStringsSep "\n\t" (map (x: "PB_${x.flag}") + (builtins.filter (x: x.cond) [ + { cond = enableMalloc; flag = "ENABLE_MALLOC=1"; } + { cond = noPackedStructs; flag = "NO_PACKED_STRUCTS=1"; } + { cond = maxRequiredFields != null; flag = "MAX_REQUIRED_FIELDS=${maxRequiredFields}"; } + { cond = field32bit; flag = "FIELD_32BIT=1"; } + { cond = noErrmsg; flag = "NO_ERRMSG=1"; } + { cond = bufferOnly; flag = "BUFFER_ONLY=1"; } + { cond = systemHeader != null; flag = "SYSTEM_HEADER=${systemHeader}"; } + { cond = without64bit; flag = "WITHOUT_64BIT=1"; } + { cond = encodeArraysUnpacked; flag = "ENCODE_ARRAYS_UNPACKED=1"; } + { cond = convertDoubleFloat; flag = "CONVERT_DOUBLE_FLOAT=1"; } + { cond = validateUtf8; flag = "VALIDATE_UTF8=1"; } + { cond = littleEndian8bit; flag = "LITTLE_ENDIAN_8BIT=1"; } + { cond = c99StaticAssert; flag = "C99_STATIC_ASSERT=1"; } + { cond = noStaticAssert; flag = "NO_STATIC_ASSERT=1"; } + ]))} + ) + ''; + in + '' + cat << EOF >> CMakeLists.txt + ${compile_definitions "protobuf-nanopb"} + ${compile_definitions "protobuf-nanopb-static"} + EOF + ''; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=ON" + "-Dnanopb_BUILD_GENERATOR=OFF" + "-Dnanopb_BUILD_RUNTIME=ON" + ]; + }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-annotations/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-annotations/default.nix index c2ffe6135f..5e53e72c62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-annotations/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, protobuf, nanopb }: +{ lib, stdenv, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-annotations"; @@ -8,6 +8,8 @@ stdenv.mkDerivation { fileset = lib.fileset.unions [ ./withannotations.proto ]; }; + buildInputs = [ nanopb ]; + # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did @@ -16,7 +18,7 @@ stdenv.mkDerivation { buildPhase = '' mkdir $out - ${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto + protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-annotations/withannotations.proto similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-annotations/withannotations.proto diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/default.nix index f6bf28f3b6..78be532d56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, protobuf, nanopb }: +{ lib, stdenv, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-options"; @@ -11,6 +11,8 @@ stdenv.mkDerivation { ]; }; + buildInputs = [ nanopb ]; + # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did @@ -19,7 +21,7 @@ stdenv.mkDerivation { buildPhase = '' mkdir $out - ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto + protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/withoptions.options similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/withoptions.options diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/withoptions.proto similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-message-with-options/withoptions.proto diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto2/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto2/default.nix index f8cd35cbf3..5896679567 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, protobuf, nanopb }: +{ lib, stdenv, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto2"; @@ -8,6 +8,8 @@ stdenv.mkDerivation { fileset = lib.fileset.unions [ ./simple.proto ]; }; + buildInputs = [ nanopb ]; + # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did @@ -16,7 +18,7 @@ stdenv.mkDerivation { buildPhase = '' mkdir $out - ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto2/simple.proto similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto2/simple.proto diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto3/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto3/default.nix index d92698d21e..6276126131 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, protobuf, nanopb }: +{ lib, stdenv, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto3"; @@ -7,6 +7,9 @@ stdenv.mkDerivation { root = ./.; fileset = lib.fileset.unions [ ./simple.proto ]; }; + + buildInputs = [ nanopb ]; + # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did @@ -15,7 +18,7 @@ stdenv.mkDerivation { buildPhase = '' mkdir $out - ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto b/third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto3/simple.proto similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto rename to third_party/nixpkgs/pkgs/by-name/na/nanopb/test-simple-proto3/simple.proto diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-gtk/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-gtk/package.nix diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-remote/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix index 247e78e802..f96b06f2e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; - rev = "v${version}"; - hash = "sha256-xCoCmWdliw7zSxLv8IJl2F03TPMS3dRC40JH1XBirTI="; + rev = "refs/tags/v${version}"; + hash = "sha256-PUBomSo11URCCJB/qFeSHSS3pw/vvcgDBo9Kc0lJQLE="; }; - vendorHash = "sha256-V5ykn/0vXSrCtCX4EEoThXMKE6EVTjc9zXt89G+34N8="; + vendorHash = "sha256-wVZWP8yvazxs8sG47MTOlWzKwjsZO/b7PN987fwWEaY="; ldflags = [ "-s" @@ -36,10 +36,10 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Agent of Nezha Monitoring"; homepage = "https://github.com/nezhahq/agent"; - license = licenses.asl20; - maintainers = with maintainers; [ moraxyc ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ moraxyc ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nilaway/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nilaway/package.nix index 824ae17554..a4b3f4c4f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nilaway/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nilaway/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nilaway"; - version = "0-unstable-2024-04-04"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "uber-go"; repo = "nilaway"; - rev = "755a685ab68b85d9b36833b38972a559f217d396"; - hash = "sha256-sDDBITrGD79pcbsrcrs6D8njBp4kuK1NkuBPwzIkaUE="; + rev = "e90288479601315af13b7fdd3ccd6b50c53a8e7c"; + hash = "sha256-6bArrCcAZc8DWJlDxKKmlHAbcEuU68HgqJTK9s7ZGig="; }; - vendorHash = "sha256-1j7NwfqrinEQL6XBO0PvwzxFytujoCtynMEXL2oTLkM="; + vendorHash = "sha256-rLyU2HdlkDFh+MBIVnbEIIlVR7/mq9heZWzN7GRw0Dc="; excludedPackages = [ "tools" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock index f0fe7268f0..0c1286e542 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ni/niri/Cargo.lock @@ -38,9 +38,9 @@ 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", @@ -105,9 +105,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", ] @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "appendlist" @@ -143,6 +143,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayvec" version = "0.7.4" @@ -172,16 +181,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -224,17 +233,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" 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", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -252,12 +261,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", ] @@ -286,17 +295,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -321,7 +330,16 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", ] [[package]] @@ -360,7 +378,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -405,33 +423,22 @@ 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.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -446,22 +453,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -508,7 +515,7 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "thiserror", @@ -516,18 +523,17 @@ dependencies = [ [[package]] name = "calloop" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" dependencies = [ "async-task", "bitflags 2.5.0", "futures-io", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", - "thiserror", ] [[package]] @@ -544,9 +550,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -586,9 +592,9 @@ 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 = "cgmath" @@ -596,7 +602,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "approx", + "approx 0.4.0", "num-traits", ] @@ -611,9 +617,9 @@ dependencies = [ [[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", @@ -651,7 +657,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -764,18 +770,18 @@ dependencies = [ [[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-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" @@ -901,6 +907,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.12.0" @@ -948,15 +960,15 @@ checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[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", @@ -964,13 +976,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.67", ] [[package]] @@ -1008,43 +1020,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", ] @@ -1116,7 +1107,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1218,7 +1209,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1277,9 +1268,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1289,9 +1280,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -1379,9 +1370,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -1397,9 +1388,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -1425,7 +1416,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1441,15 +1432,15 @@ dependencies = [ [[package]] name = "glam" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" [[package]] name = "glib" -version = "0.19.6" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0116c428e4841cab183a32a71b900fd6712194c20f9c424f01d2c016c96bd23" +checksum = "b664491bc77ab55daa6714a592cdbe1a55e28abec09cb50e87689b90de456ff4" dependencies = [ "bitflags 2.5.0", "futures-channel", @@ -1469,22 +1460,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" +checksum = "1d405205a405182f95e637710850a8e82f25ba01fdd6baebc82dabeaf0883376" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1498,9 +1489,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1509,9 +1500,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ "glib", "graphene-sys", @@ -1520,9 +1511,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1591,7 +1582,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1644,23 +1635,18 @@ 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 = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "idna" version = "0.5.0" @@ -1703,9 +1689,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", ] @@ -1716,7 +1702,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -1801,7 +1787,7 @@ dependencies = [ "libc", "proc-macro2", "regex", - "syn 2.0.63", + "syn 2.0.67", "terminal_size", ] @@ -1893,9 +1879,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1921,7 +1907,7 @@ checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -2000,9 +1986,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 = "linux-raw-sys" @@ -2062,9 +2048,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" @@ -2122,7 +2108,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2133,9 +2119,9 @@ 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", @@ -2143,9 +2129,9 @@ 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", "jni-sys", @@ -2164,24 +2150,26 @@ 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", ] [[package]] name = "niri" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", + "approx 0.5.1", "arrayvec", "async-channel", "async-io 1.13.0", + "atomic", "bitflags 2.5.0", "bytemuck", - "calloop 0.13.0", + "calloop 0.14.0", "clap", "directories", "drm-ffi", @@ -2197,6 +2185,7 @@ dependencies = [ "niri-config", "niri-ipc", "notify-rust", + "ordered-float", "pangocairo", "pipewire", "png", @@ -2220,13 +2209,14 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.6" +version = "0.1.7" dependencies = [ "bitflags 2.5.0", "csscolorparser", "knuffel", "miette", "niri-ipc", + "pretty_assertions", "regex", "smithay", "tracing", @@ -2235,7 +2225,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.6" +version = "0.1.7" dependencies = [ "clap", "serde", @@ -2244,7 +2234,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "gtk4", @@ -2343,10 +2333,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2371,25 +2361,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", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "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", + "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.5.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 = "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", + "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", + "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", + "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", + "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", + "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.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_id" @@ -2421,6 +2592,15 @@ dependencies = [ "libredox 0.0.2", ] +[[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -2439,9 +2619,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -2451,9 +2631,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -2463,9 +2643,9 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" +checksum = "e4c8b43c02ec1c4e16daf7fc50fbce6b8ead5705c18ae56274f703233cce1cd9" dependencies = [ "cairo-rs", "glib", @@ -2476,9 +2656,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d680caf5094d735c37312ce9166127a1d759d86a3d632b83d4a5354ee7568659" +checksum = "591904498438879785f5b7a2fdf7c38e9ec08c514b93c614b5c3b48cd11dd8d7" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2535,7 +2715,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2547,6 +2727,26 @@ 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.67", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2561,9 +2761,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -2653,13 +2853,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -2684,6 +2884,16 @@ 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 = "proc-macro-crate" version = "1.3.1" @@ -2729,9 +2939,9 @@ dependencies = [ [[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", ] @@ -2753,7 +2963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2770,7 +2980,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -2861,18 +3071,9 @@ dependencies = [ [[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" - -[[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", -] +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "redox_syscall" @@ -2896,14 +3097,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]] @@ -2917,13 +3118,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]] @@ -2934,9 +3135,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 = "rustc-hash" @@ -2976,7 +3177,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -3039,22 +3240,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3076,7 +3277,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3153,11 +3354,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "appendlist", "bitflags 2.5.0", - "calloop 0.13.0", + "calloop 0.14.0", "cc", "cgmath", "cursor-icon", @@ -3187,10 +3388,12 @@ dependencies = [ "tracing", "udev", "wayland-backend", + "wayland-client", + "wayland-cursor", "wayland-egl", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-protocols-misc", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.3.1", "wayland-server", "wayland-sys", "winit", @@ -3216,8 +3419,8 @@ dependencies = [ "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", ] @@ -3225,7 +3428,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "drm", "edid-rs", @@ -3275,9 +3478,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -3337,22 +3540,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3401,14 +3604,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -3444,15 +3647,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -3474,7 +3677,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3600,15 +3803,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[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", @@ -3617,9 +3820,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 = "valuable" @@ -3691,7 +3894,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-shared", ] @@ -3725,7 +3928,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3738,9 +3941,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", @@ -3752,9 +3955,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ "bitflags 2.5.0", "rustix 0.38.34", @@ -3775,9 +3978,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ "rustix 0.38.34", "wayland-client", @@ -3786,9 +3989,9 @@ dependencies = [ [[package]] name = "wayland-egl" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +checksum = "18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8" dependencies = [ "wayland-backend", "wayland-sys", @@ -3804,18 +4007,29 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-protocols-misc" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +checksum = "e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331" dependencies = [ "bitflags 2.5.0", "wayland-backend", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] @@ -3829,7 +4043,7 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -3842,16 +4056,28 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" dependencies = [ "proc-macro2", "quick-xml 0.31.0", @@ -3860,9 +4086,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" +checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" dependencies = [ "bitflags 2.5.0", "downcast-rs", @@ -3874,9 +4100,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" dependencies = [ "dlib", "libc", @@ -3898,9 +4124,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -3978,9 +4204,9 @@ dependencies = [ [[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", ] @@ -4192,46 +4418,50 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop 0.12.4", "cfg_aliases", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall", "rustix 0.38.34", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4248,9 +4478,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4295,12 +4525,12 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4329,9 +4559,9 @@ 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" @@ -4354,6 +4584,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "yansi-term" version = "0.1.2" @@ -4446,7 +4682,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix index 8799988a4b..1f17f089db 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/niri/package.nix @@ -19,19 +19,19 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484="; + hash = "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-UzX5pws8yxJhXdKIDzu6uw+PlVLRS9U9ZAfQovKv0w0="; + "smithay-0.3.0" = "sha256-K1lguY6f1mbrfxkDNeLlNAXSM9JC8Jm61MyBIsIYiNs="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix new file mode 100644 index 0000000000..42496a5bff --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-btm/package.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "nix-btm"; + version = "0.2.0"; + + src = fetchCrate { + inherit version; + pname = "nix-btm"; + hash = "sha256-f8XFWlx+gwhF/OD8+tPcLGV/v0QnsDWOcqpY3Js+FAo="; + }; + + cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; + + buildInputs = lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); + + meta = with lib; { + description = "Rust tool to monitor Nix processes"; + homepage = "https://github.com/DieracDelta/nix-btm"; + license = licenses.mit; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/closure.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/closure.nix new file mode 100644 index 0000000000..3e361114bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/closure.nix @@ -0,0 +1,37 @@ +# Use exportReferencesGraph to capture the possible dependencies of the +# drivers (e.g. libc linked through DT_RUNPATH) and ensure they are mounted +# in the sandbox as well. In practice, things seemed to have worked without +# this as well, but we go with the safe option until we understand why. + +{ + lib, + runCommand, + python3Packages, + allowedPatterns, +}: +runCommand "allowed-patterns.json" + { + nativeBuildInputs = [ python3Packages.python ]; + exportReferencesGraph = builtins.concatMap ( + name: + builtins.concatMap ( + path: + let + prefix = "${builtins.storeDir}/"; + # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 + exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; + isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); + in + lib.optionals isStorePath [ + exportName + path + ] + ) allowedPatterns.${name}.paths + ) (builtins.attrNames allowedPatterns); + env.storeDir = "${builtins.storeDir}/"; + shallowConfig = builtins.toJSON allowedPatterns; + passAsFile = [ "shallowConfig" ]; + } + '' + python ${./scripts/nix_required_mounts_closure.py} + '' diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py new file mode 100644 index 0000000000..6f05ee913a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -0,0 +1,201 @@ +#!/usr/bin/env python3 + +import glob +import json +import subprocess +import textwrap +from argparse import ArgumentParser +from collections import deque +from itertools import chain +from pathlib import Path +from typing import Deque, Dict, List, Set, Tuple, TypeAlias, TypedDict +import logging + +Glob: TypeAlias = str +PathString: TypeAlias = str + + +class Mount(TypedDict): + host: PathString + guest: PathString + + +class Pattern(TypedDict): + onFeatures: List[str] + paths: List[Glob | Mount] + unsafeFollowSymlinks: bool + + +AllowedPatterns: TypeAlias = Dict[str, Pattern] + + +parser = ArgumentParser("pre-build-hook") +parser.add_argument("derivation_path") +parser.add_argument("sandbox_path", nargs="?") +parser.add_argument("--patterns", type=Path, required=True) +parser.add_argument("--nix-exe", type=Path, required=True) +parser.add_argument( + "--issue-command", + choices=("always", "conditional", "never"), + default="conditional", + help="Whether to print extra-sandbox-paths", +) +parser.add_argument( + "--issue-stop", + choices=("always", "conditional", "never"), + default="conditional", + help="Whether to print the final empty line", +) +parser.add_argument("-v", "--verbose", action="count", default=0) + + +def symlink_parents(p: Path) -> List[Path]: + out = [] + while p.is_symlink() and p not in out: + parent = p.readlink() + if parent.is_relative_to("."): + p = p / parent + else: + p = parent + out.append(p) + return out + + +def get_strings(drv_env: dict, name: str) -> List[str]: + if "__json" in drv_env: + return list(json.loads(drv_env["__json"]).get(name, [])) + else: + return drv_env.get(name, "").split() + + +def validate_mounts(pattern: Pattern) -> List[Tuple[PathString, PathString, bool]]: + roots = [] + for mount in pattern["paths"]: + if isinstance(mount, PathString): + matches = glob.glob(mount) + assert matches, f"Specified host paths do not exist: {mount}" + + roots.extend((m, m, pattern["unsafeFollowSymlinks"]) for m in matches) + else: + assert isinstance(mount, dict) and "host" in mount, mount + assert Path( + mount["host"] + ).exists(), f"Specified host paths do not exist: {mount['host']}" + roots.append( + ( + mount["guest"], + mount["host"], + pattern["unsafeFollowSymlinks"], + ) + ) + + return roots + + +def entrypoint(): + args = parser.parse_args() + + VERBOSITY_LEVELS = [logging.ERROR, logging.INFO, logging.DEBUG] + + level_index = min(args.verbose, len(VERBOSITY_LEVELS) - 1) + logging.basicConfig(level=VERBOSITY_LEVELS[level_index]) + + drv_path = args.derivation_path + + with open(args.patterns, "r") as f: + allowed_patterns = json.load(f) + + if not Path(drv_path).exists(): + logging.error( + f"{drv_path} doesn't exist." + " Cf. https://github.com/NixOS/nix/issues/9272" + " Exiting the hook", + ) + + proc = subprocess.run( + [ + args.nix_exe, + "show-derivation", + drv_path, + ], + capture_output=True, + ) + try: + parsed_drv = json.loads(proc.stdout) + except json.JSONDecodeError: + logging.error( + "Couldn't parse the output of" + "`nix show-derivation`" + f". Expected JSON, observed: {proc.stdout}", + ) + logging.error(textwrap.indent(proc.stdout.decode("utf8"), prefix=" " * 4)) + logging.info("Exiting the nix-required-binds hook") + return + [canon_drv_path] = parsed_drv.keys() + + known_features = set( + chain.from_iterable( + pattern["onFeatures"] for pattern in allowed_patterns.values() + ) + ) + + parsed_drv = parsed_drv[canon_drv_path] + drv_env = parsed_drv.get("env", {}) + required_features = get_strings(drv_env, "requiredSystemFeatures") + required_features = list(filter(known_features.__contains__, required_features)) + + patterns: List[Pattern] = list( + pattern + for pattern in allowed_patterns.values() + for path in pattern["paths"] + if any(feature in required_features for feature in pattern["onFeatures"]) + ) # noqa: E501 + + queue: Deque[Tuple[PathString, PathString, bool]] = deque( + (mnt for pattern in patterns for mnt in validate_mounts(pattern)) + ) + + unique_mounts: Set[Tuple[PathString, PathString]] = set() + mounts: List[Tuple[PathString, PathString]] = [] + + while queue: + guest_path_str, host_path_str, follow_symlinks = queue.popleft() + if (guest_path_str, host_path_str) not in unique_mounts: + mounts.append((guest_path_str, host_path_str)) + unique_mounts.add((guest_path_str, host_path_str)) + + if not follow_symlinks: + continue + + host_path = Path(host_path_str) + if not (host_path.is_dir() or host_path.is_symlink()): + continue + + # assert host_path_str == guest_path_str, (host_path_str, guest_path_str) + + for child in host_path.iterdir() if host_path.is_dir() else [host_path]: + for parent in symlink_parents(child): + parent_str = parent.absolute().as_posix() + queue.append((parent_str, parent_str, follow_symlinks)) + + # the pre-build-hook command + if args.issue_command == "always" or ( + args.issue_command == "conditional" and mounts + ): + print("extra-sandbox-paths") + print_paths = True + else: + print_paths = False + + # arguments, one per line + for guest_path_str, host_path_str in mounts if print_paths else []: + print(f"{guest_path_str}={host_path_str}") + + # terminated by an empty line + something_to_terminate = args.issue_stop == "conditional" and mounts + if args.issue_stop == "always" or something_to_terminate: + print() + + +if __name__ == "__main__": + entrypoint() diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix new file mode 100644 index 0000000000..197e0812a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -0,0 +1,67 @@ +{ + addOpenGLRunpath, + allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; }, + allowedPatterns ? rec { + # This config is just an example. + # When the hook observes either of the following requiredSystemFeatures: + nvidia-gpu.onFeatures = [ + "gpu" + "nvidia-gpu" + "opengl" + "cuda" + ]; + # It exposes these paths in the sandbox: + nvidia-gpu.paths = [ + addOpenGLRunpath.driverLink + "/dev/dri" + "/dev/nvidia*" + ]; + nvidia-gpu.unsafeFollowSymlinks = true; + }, + callPackage, + extraWrapperArgs ? [ ], + lib, + makeWrapper, + nix, + nixosTests, + python3Packages, +}: + +let + attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + pname = attrs.project.name; + inherit (attrs.project) version; +in + +python3Packages.buildPythonApplication { + inherit pname version; + pyproject = true; + + src = lib.cleanSource ./.; + + nativeBuildInputs = [ + makeWrapper + python3Packages.setuptools + ]; + + postFixup = '' + wrapProgram $out/bin/${pname} \ + --add-flags "--patterns ${allowedPatternsPath}" \ + --add-flags "--nix-exe ${lib.getExe nix}" \ + ${builtins.concatStringsSep " " extraWrapperArgs} + ''; + + passthru = { + inherit allowedPatterns; + tests = { + inherit (nixosTests) nix-required-mounts; + }; + }; + meta = { + inherit (attrs.project) description; + homepage = attrs.project.urls.Homepage; + license = lib.licenses.mit; + mainProgram = attrs.project.name; + maintainers = with lib.maintainers; [ SomeoneSerge ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/pyproject.toml b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/pyproject.toml new file mode 100644 index 0000000000..bb754e08ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/pyproject.toml @@ -0,0 +1,20 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = [ "setuptools" ] + +[project] +name = "nix-required-mounts" +version = "0.0.1" +description = """ +A --pre-build-hook for Nix, \ +that allows to expose extra paths in the build sandbox \ +based on derivations' requiredSystemFeatrues""" + +[project.urls] +Homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nix-required-mounts" + +[project.scripts] +nix-required-mounts = "nix_required_mounts:entrypoint" + +[tool.black] +line-length = 79 diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py new file mode 100644 index 0000000000..4425e98d09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py @@ -0,0 +1,45 @@ +import json +import os + +store_dir = os.environ["storeDir"] + +with open(os.environ["shallowConfigPath"], "r") as f: + config = json.load(f) + +cache = {} + + +def read_edges(path: str | dict) -> list[str | dict]: + if isinstance(path, dict): + return [path] + assert isinstance(path, str) + + if not path.startswith(store_dir): + return [path] + if path in cache: + return cache[path] + + name = f"references-{path.removeprefix(store_dir)}" + + assert os.path.exists(name) + + with open(name, "r") as f: + return [p.strip() for p in f.readlines() if p.startswith(store_dir)] + + +def host_path(mount: str | dict) -> str: + if isinstance(mount, dict): + return mount["host"] + assert isinstance(mount, str), mount + return mount + + +for pattern in config: + closure = [] + for path in config[pattern]["paths"]: + closure.append(path) + closure.extend(read_edges(path)) + config[pattern]["paths"] = list({host_path(m): m for m in closure}.values()) + +with open(os.environ["out"], "w") as f: + json.dump(config, f) diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix index a9f1b7105c..ddcf0c2a43 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-unit/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nix-unit"; - version = "2.18.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-unit"; rev = "v${finalAttrs.version}"; - hash = "sha256-9wq14p+85oW4HlD42NJ0jyA++z3nEYjFQ6uT40xdfbc="; + hash = "sha256-sDYeiwVo6+GL4/AHadeExVqE9j3wzdUsyMLs1OYQW7Y="; }; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { # We pin the nix version to a known working one here as upgrades can likely break the build. # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests # On each update of nix unit we should re-evaluate what version we need. - nixVersions.nix_2_18 + nixVersions.nix_2_23 boost ]; diff --git a/third_party/nixpkgs/pkgs/by-name/no/nodemon/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nodemon/package.nix new file mode 100644 index 0000000000..03e432628f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/no/nodemon/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "nodemon"; + version = "3.1.4"; + + src = fetchFromGitHub { + owner = "remy"; + repo = "nodemon"; + rev = "v${version}"; + hash = "sha256-bAsq1eoeQ03VhNYgdYJQnZRCxyvt46C+3scihGp+9GU="; + }; + + npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + mainProgram = "rtlcss"; + homepage = "https://rtlcss.com"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/notary/default.nix b/third_party/nixpkgs/pkgs/by-name/no/notary/package.nix similarity index 58% rename from third_party/nixpkgs/pkgs/tools/security/notary/default.nix rename to third_party/nixpkgs/pkgs/by-name/no/notary/package.nix index be147369ff..1f35222ee9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/notary/package.nix @@ -1,41 +1,32 @@ -{ lib, fetchFromGitHub, buildGoPackage, libtool }: - -buildGoPackage rec { +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { pname = "notary"; - version = "0.6.1"; - gitcommit = "d6e1431f"; + version = "0.6.1-unstable-2024-04-16"; src = fetchFromGitHub { - owner = "theupdateframework"; + owner = "notaryproject"; repo = "notary"; - rev = "v${version}"; - sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; + rev = "9d2b3b35929392c9945d976b8bdecbe2f53a299e"; + sha256 = "sha256-u19BfTJwRWholK0b3BcgSmcMM9AR7OeXo64AOi87r0A="; }; - patches = [ ./no-git-usage.patch ]; + vendorHash = null; - buildInputs = [ libtool ]; - buildPhase = '' - runHook preBuild - cd go/src/github.com/theupdateframework/notary - SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} - runHook postBuild - ''; + tags = [ + "pkcs11" + ]; - goPackagePath = "github.com/theupdateframework/notary"; + ldflags = [ + "-X github.com/theupdateframework/notary/version.NotaryVersion=${version}" + ]; - installPhase = '' - runHook preInstall - install -D bin/notary $out/bin/notary - runHook postInstall - ''; + # Tests try to use network. + doCheck = false; - #doCheck = true; # broken by tzdata: 2018g -> 2019a - checkPhase = '' - make test PKGS=github.com/theupdateframework/notary/cmd/notary - ''; - - meta = with lib; { + meta = { description = "Project that allows anyone to have trust over arbitrary collections of data"; mainProgram = "notary"; longDescription = '' @@ -58,9 +49,9 @@ buildGoPackage rec { relying only on the publisher's key to determine the validity and integrity of the received content. ''; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/theupdateframework/notary"; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.unix; + maintainers = [ lib.maintainers.vdemeester ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix index c0cd511cdc..5585d08132 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-jC+jyg97ifn2T6o0K2KEELGbko5eBIo9ZFLw9ly9lyE="; + hash = "sha256-P1LJFVe2MUkvKFP4XJvuFup9JKPv9Y2uWfoi8/N7JUo="; }; - cargoHash = "sha256-byDFHxXqXd14/ql1FGj/ySn7zrNgSGo5RBGJrHIRDC4="; + cargoHash = "sha256-owj5rzqtlbMMc84u5so0QbEzd2vnWk3KyM/A9ChxoVw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix index 98ccc3f451..969a807bc5 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.9"; + version = "9.9.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-BdlS0gBeGI+5hEgUvkdJPEuZhXpA7Spd2wJ2PtmCkpM="; + hash = "sha256-eXC496D45JAZrwnxDB7JlFTLd30MkpHrxkP1tsSc6Jk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix index efadd6e13f..7f212aef83 100644 --- a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-8y+7FUxsw5nxyCYdukigyQDkCgcHYLFSoIVmr0P/IVs="; + hash = "sha256-Ivlab7l+aNojHICAHHAhojx8RXI8h3jMnl7ehFDkLW0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/of/offpunk/package.nix b/third_party/nixpkgs/pkgs/by-name/of/offpunk/package.nix index db3c61b144..5c107df67e 100644 --- a/third_party/nixpkgs/pkgs/by-name/of/offpunk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/of/offpunk/package.nix @@ -32,7 +32,7 @@ let in python3Packages.buildPythonApplication rec { pname = "offpunk"; - version = "2.2"; + version = "2.3"; pyproject = true; disabled = python3Packages.pythonOlder "3.7"; @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-ygVL17qqmNB7hzw1VuYIAbirbaq4EVppWCHSvTl+/Jw="; + hash = "sha256-Tiby+JjPc7eFQKziQFUdqcNgx9UhU4GNeRcI/aAzcvk="; }; nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix index ef32db45e7..3cce7d592f 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ alva melkor333 ]; + maintainers = with lib.maintainers; [ melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix index bef82befbd..67dbc80e8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix @@ -2,16 +2,17 @@ let readline-all = symlinkJoin { - name = "readline-all"; paths = [ readline readline.dev ]; + name = "readline-all"; + paths = [ readline readline.dev ]; }; in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-g8uEK68J9BsCHEvJGDgsKUmsuR1MvChEC9A00Y2sZU4="; + hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8="; }; postPatch = '' @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ alva mkg20001 melkor333 ]; + maintainers = with lib.maintainers; [ mkg20001 melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix index 2bfb8eb97c..8d27dec894 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix @@ -7,6 +7,7 @@ , overrideCC , makeWrapper , stdenv +, addDriverRunpath , cmake , gcc12 @@ -14,8 +15,8 @@ , libdrm , rocmPackages , cudaPackages -, linuxPackages , darwin +, autoAddDriverRunpath , nixosTests , testers @@ -31,13 +32,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-AKAuySyReG6kkwwgWodAso44+kri2Gz5VSLco8GBoIw="; + hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4="; fetchSubmodules = true; }; @@ -53,6 +54,7 @@ let (preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=") (preparePatch "05-default-pretokenizer.diff" "sha256-JnCmFzAkmuI1AqATG3jbX7nGIam4hdDKqqbG5oh7h70=") (preparePatch "06-qwen2.diff" "sha256-nMtoAQUsjYuJv45uTlz8r/K1oF5NUsc75SnhgfSkE30=") + (preparePatch "07-gemma.diff" "sha256-dKJrRvg/XC6xtwxLHZ7lFkLNMwT8Ugmd5xRPuKQDXvU=") ]; preparePatch = patch: hash: fetchpatch { @@ -117,16 +119,16 @@ let appleFrameworks.MetalPerformanceShaders ]; - runtimeLibs = lib.optionals enableRocm [ - rocmPath - ] ++ lib.optionals enableCuda [ - linuxPackages.nvidia_x11 - ]; - wrapperOptions = builtins.concatStringsSep " " ([ - "--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'" + wrapperOptions = [ + # ollama embeds llama-cpp binaries which actually run the ai models + # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH + # LD_LIBRARY_PATH is temporarily required to use the gpu + # until these llama-cpp binaries can have their runpath patched + "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'" ] ++ lib.optionals enableRocm [ "--set-default HIP_PATH '${rocmPath}'" - ]); + ]; + wrapperArgs = builtins.concatStringsSep " " wrapperOptions; goBuild = @@ -152,6 +154,7 @@ goBuild ((lib.optionalAttrs enableRocm { rocmPackages.llvm.bintools ] ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper + autoAddDriverRunpath ] ++ lib.optionals stdenv.isDarwin metalFrameworks; @@ -187,8 +190,7 @@ goBuild ((lib.optionalAttrs enableRocm { mv "$out/bin/app" "$out/bin/.ollama-app" '' + lib.optionalString (enableRocm || enableCuda) '' # expose runtime libraries necessary to use the gpu - mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" - makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${wrapperOptions} + wrapProgram "$out/bin/ollama" ${wrapperArgs} ''; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix index 26d4ff9796..68a53dbc0a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-06-13"; + version = "0-unstable-2024-06-18"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "09f865e685f8ebddaf994e51baeabed795e7f849"; - hash = "sha256-JdKmXMyRZCf6UYo5sKmiIaeZNgnbUm5ALP39tf6z36w="; + rev = "6209c11593a3ac175d058a1b12a884fa4d288620"; + hash = "sha256-YAeYmX62+5FjHIYt2uWY4aVW6v326vNFl4vQLl585lg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix b/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix index d5e16aa2ba..ab72a4933a 100644 --- a/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "omnictl"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-fPhirFk6JIybBnDwcvYC/oWizhQSEGsosFuh+n/r/Pg="; + hash = "sha256-Qm5Q+yZq6m/3xAAMdz57fXC13lLDMu5GY1xs5vHAFoo="; }; vendorHash = "sha256-BF/F/siVIYJT4abOlwQjpnQpmNFdOo566VGPIo08PO0="; diff --git a/third_party/nixpkgs/pkgs/by-name/oo/oo7/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/oo/oo7/Cargo.lock index 25dabd4253..ac9873cac4 100644 --- a/third_party/nixpkgs/pkgs/by-name/oo/oo7/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/oo/oo7/Cargo.lock @@ -76,9 +76,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", ] @@ -95,12 +95,12 @@ dependencies = [ [[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.1", - "event-listener-strategy 0.5.2", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock", "cfg-if", @@ -162,20 +162,31 @@ 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", + "event-listener-strategy", "pin-project-lite", ] [[package]] -name = "async-process" -version = "2.2.2" +name = "async-net" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[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", @@ -184,7 +195,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", + "event-listener", "futures-lite", "rustix", "tracing", @@ -204,9 +215,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ "async-io", "async-lock", @@ -251,9 +262,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -330,9 +341,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-if" @@ -371,9 +382,9 @@ 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", @@ -381,9 +392,9 @@ dependencies = [ [[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", @@ -393,9 +404,9 @@ 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", "proc-macro2", @@ -405,9 +416,9 @@ 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 = "colorchoice" @@ -475,9 +486,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", @@ -485,9 +496,9 @@ 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", @@ -510,17 +521,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[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" @@ -532,23 +532,13 @@ dependencies = [ "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", + "event-listener", "pin-project-lite", ] @@ -692,6 +682,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" @@ -819,9 +815,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" @@ -834,9 +830,9 @@ dependencies = [ [[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", ] @@ -972,15 +968,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.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -993,12 +989,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.3.2" +version = "0.3.3" dependencies = [ "aes", "async-fs", "async-io", "async-lock", + "async-net", "blocking", "cbc", "cipher", @@ -1027,7 +1024,7 @@ dependencies = [ [[package]] name = "oo7-cli" -version = "0.3.2" +version = "0.3.3" dependencies = [ "chrono", "clap", @@ -1038,7 +1035,7 @@ dependencies = [ [[package]] name = "oo7-portal" -version = "0.3.2" +version = "0.3.3" dependencies = [ "futures-channel", "futures-util", @@ -1137,9 +1134,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -1154,13 +1151,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -1184,9 +1181,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1455,9 +1452,9 @@ dependencies = [ [[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", @@ -1474,9 +1471,9 @@ 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", @@ -1588,9 +1585,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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 = "valuable" @@ -1851,19 +1848,19 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "zbus" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast", "async-executor", @@ -1876,7 +1873,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.1", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -1900,9 +1897,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/third_party/nixpkgs/pkgs/by-name/oo/oo7/package.nix b/third_party/nixpkgs/pkgs/by-name/oo/oo7/package.nix index 8054daa560..a126a27fd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/oo/oo7/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oo/oo7/package.nix @@ -1,22 +1,23 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, oo7 -, openssl -, pkg-config -, testers +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + oo7, + openssl, + pkg-config, + testers, }: rustPlatform.buildRustPackage rec { pname = "oo7"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "bilelmoussaoui"; repo = "oo7"; rev = version; - hash = "sha256-oNzDjPMPM8opINSHC8T4ivQ6mfRVmN2VXPZAFkBZS8U="; + hash = "sha256-KoceqJCxb61EF29Fw9UU2LCHxDR0ExR3lnt85Nqg6tg="; }; cargoLock = { @@ -27,13 +28,9 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; postInstall = '' install -Dm644 portal/data/oo7-portal.portal $out/share/xdg-desktop-portal/portals/oo7.portal @@ -43,17 +40,21 @@ rustPlatform.buildRustPackage rec { ''; passthru = { - tests.testVersion = testers.testVersion { - package = oo7; - }; - updateScript = nix-update-script { }; + tests.testVersion = testers.testVersion { package = oo7; }; + + # TODO: re-enable this when upstream adds a Cargo.lock + # updateScript = nix-update-script { }; }; meta = with lib; { description = "James Bond went on a new mission as a Secret Service provider"; homepage = "https://github.com/bilelmoussaoui/oo7"; + changelog = "https://github.com/bilelmoussaoui/oo7/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ getchoo Scrumplex ]; + maintainers = with maintainers; [ + getchoo + Scrumplex + ]; platforms = platforms.linux; mainProgram = "oo7-cli"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix index 1292ff3c27..90bda88021 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-copxy9fgHTHfF14bh9ddF4eTWx2GP2Mkw3lr+1NKKkI="; + hash = "sha256-tsJILQ+CuVy8LYSixYNJAwSIZtRegrXXvGzvyf7Knd0="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-whddW3ThC/zlttqhV3wf15roaCgp0H/BELWLs9/c5Jc="; + npmDepsHash = "sha256-fB5gvC2sLfH2dJJi+CYyF7PRg+GhZDavhKgeRStaR7I="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -63,8 +63,10 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ aiohttp + anthropic apscheduler argon2-cffi + authlib bcrypt beautifulsoup4 black @@ -85,6 +87,7 @@ python3.pkgs.buildPythonApplication rec { langchain-community langfuse markdown + openai opencv4 openpyxl pandas @@ -94,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 pydub pyjwt + pymongo pymysql pypandoc pypdf @@ -105,8 +109,10 @@ python3.pkgs.buildPythonApplication rec { pyxlsb rank-bm25 rapidocr-onnxruntime + redis requests sentence-transformers + sqlalchemy unstructured uvicorn validators diff --git a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix index 5607d55a0b..173e4b05d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-06-01"; + version = "0-unstable-2024-06-12"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "49c4b89579fd49c5b40b72924d6593fcd47c5065"; - hash = "sha256-Aubf1tupyXzmff3ho/yKx9B3uJ8I0aoZi9zRV3A89Pc="; + rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f"; + hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix new file mode 100644 index 0000000000..0db67f6a22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgp-ca/package.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitLab +, lib +, darwin +, nettle +, nix-update-script +, rustPlatform +, pkg-config +, pcsclite +, openssl +, gnupg +, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "openpgp-ca"; + version = "0.13.1"; + + src = fetchFromGitLab { + owner = "openpgp-ca"; + repo = "openpgp-ca"; + rev = "openpgp-ca/v${version}"; + hash = "sha256-6K7H/d82Ge+JQykqTXAD43wlGTQl+U9D/vA+CNz4rfM="; + }; + + cargoHash = "sha256-PrbepiaQbfGEqJRIcOMR6ED3BLopZLhospTzWRUoW0A="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + nativeCheckInputs = [ + gnupg + ]; + + buildInputs = [ + openssl + sqlite + pcsclite + nettle + ] ++ lib.optionals stdenv.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 + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Tool for managing OpenPGP keys within organizations"; + homepage = "https://openpgp-ca.org/"; + changelog = "https://openpgp-ca.org/doc/changelog/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cherrykitten ]; + mainProgram = "oca"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-collector-builder/package.nix new file mode 100644 index 0000000000..1f47665155 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-collector-builder/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "ocb"; + version = "0.101.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-collector"; + rev = "cmd/builder/v${version}"; + hash = "sha256-Ucp00OjyPtHA6so/NOzTLtPSuhXwz6A2708w2WIZb/E="; + }; + + sourceRoot = "${src.name}/cmd/builder"; + vendorHash = "sha256-MTwD9xkrq3EudppLSoONgcPCBWlbSmaODLH9NtYgVOk="; + + CGO_ENABLED = 0; + ldflags = [ + "-s" + "-w" + "-X go.opentelemetry.io/collector/cmd/builder/internal.version=${version}" + ]; + + # The TestGenerateAndCompile tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping. + checkFlags = [ "-skip TestGenerateAndCompile" ]; + + # Rename the to ocb (it's generated as "builder") + postInstall = '' + mv $out/bin/builder $out/bin/ocb + ''; + + meta = { + description = "OpenTelemetry Collector"; + homepage = "https://github.com/open-telemetry/opentelemetry-collector.git"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ davsanchez ]; + mainProgram = "ocb"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix index 3b75b44a6e..53b6d621e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.4.1"; + version = "23.5.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-D0HQ00NCep0hAQ+dDWoinIxivloqgjPbp2lUunTxoyM="; + hash = "sha256-bAQFMYHE9nozmfRILFAswN9y0DxnX8LK2E6c3yqzWlA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvas-smb/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvas-smb/package.nix new file mode 100644 index 0000000000..16a9120179 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openvas-smb/package.nix @@ -0,0 +1,71 @@ +{ fetchFromGitHub +, fetchurl +, lib +, stdenv +, cmake +, git +, pkg-config +, glib +, gnutls +, perl +, heimdal +, popt +, libunistring +}: +let + heimdalConfigHeader = fetchurl { + url = "https://raw.githubusercontent.com/heimdal/heimdal/d8c10e68a61f10c8fca62b227a0766d294bda4a0/include/heim_threads.h"; + sha256 = "08345hkb5jbdcgh2cx3d624w4c8wxmnnsjxlw46wsnm39k4l0ihw"; + }; +in +stdenv.mkDerivation rec { + pname = "openvas-smb"; + version = "22.5.6"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "openvas-smb"; + rev = "refs/tags/v${version}"; + hash = "sha256-wnlBOHYOTWNbwzoHCpsXbuhp0uH3wBH6+Oo4Y+zSsfg="; + }; + + nativeBuildInputs = [ + cmake + git + pkg-config + ]; + + buildInputs = [ + glib + gnutls + perl + heimdal + popt + libunistring + ]; + + # The pkg expects the heimdal headers to be in a "heimdal" folder, which is the case on + # debian, but not on nix. Additionally some heimdal header names have the same names + # as kerberos header names, so the old include path is removed. + preConfigure = '' + mkdir -p include + + # symlink to change include path for heimdal headers from "heim_etc.h" to "heimdal/heim_etc.h" + ln -s ${heimdal.dev}/include include/heimdal + remove="-isystem ${heimdal.dev}/include " + NIX_CFLAGS_COMPILE=''${NIX_CFLAGS_COMPILE//"''$remove"/} + NIX_CFLAGS_COMPILE+=" -isystem $(pwd)/include"; + + # add default config header for heimdal + cp ${heimdalConfigHeader} include/heim_threads.h + ''; + + meta = with lib; { + description = "SMB module for Greenbone Community Edition"; + homepage = "https://github.com/greenbone/openvas-smb"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mi-ael ]; + mainProgram = "wmic"; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix index 5eb8ebe8bc..0d664860be 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-q1PKmC5sMBO7dJ1Ne9JWnnepFRr/Ty8K/gJIgachDeI="; + hash = "sha256-wmIC5Vzne0fe42lCBj+7kNIDG777meUuehJpgmYnPuw="; # 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-icV4MOVzPSCGhFTIixWA02Jcf/7qhQwG4sBx1kRoJks="; + vendorHash = "sha256-Irpqg+orQsDv9iof+tGC/Out6hIOmlf3sdHGY80zxdE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/paho-mqtt-cpp/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix rename to third_party/nixpkgs/pkgs/by-name/pa/paho-mqtt-cpp/package.nix index 6f1b9b215e..cf94f358cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paho-mqtt-cpp/package.nix @@ -1,19 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + paho-mqtt-c, + enableStatic ? stdenv.hostPlatform.isStatic, + enableShared ? !stdenv.hostPlatform.isStatic, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "paho.mqtt.cpp"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; - rev = "v${version}"; - hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XAQSNjO34b2BPzAf7x4a+74UdKFH5lYNMJm4kE16nkA="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl paho-mqtt-c ]; + buildInputs = [ + openssl + paho-mqtt-c + ]; cmakeFlags = [ (lib.cmakeBool "PAHO_WITH_SSL" true) @@ -28,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix index dcbee261c4..d308a93254 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix @@ -16,6 +16,7 @@ , blueprint-compiler , libxml2 , libshumate +, gst_all_1 , darwin }: @@ -96,6 +97,10 @@ stdenv.mkDerivation { libadwaita-paperplane tdlib-paperplane rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock index 39f0481e5d..a2bd60300e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[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", "once_cell", @@ -16,36 +16,30 @@ 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 = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anyhow" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[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 = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -56,7 +50,7 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cairo-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "bitflags", "cairo-sys-rs", @@ -68,7 +62,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -77,15 +71,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.88" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -118,9 +112,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", @@ -128,9 +122,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 = "field-offset" @@ -182,7 +176,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -208,7 +202,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -219,7 +213,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gio-sys", "glib-sys", @@ -231,7 +225,7 @@ dependencies = [ [[package]] name = "gdk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -245,7 +239,7 @@ dependencies = [ [[package]] name = "gdk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -281,7 +275,7 @@ dependencies = [ [[package]] name = "gio" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "futures-channel", "futures-core", @@ -298,7 +292,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "gobject-sys", @@ -310,7 +304,7 @@ dependencies = [ [[package]] name = "glib" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "bitflags", "futures-channel", @@ -331,19 +325,19 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "glib-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "libc", "system-deps", @@ -352,7 +346,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -362,7 +356,7 @@ dependencies = [ [[package]] name = "graphene-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib", "graphene-sys", @@ -372,7 +366,7 @@ dependencies = [ [[package]] name = "graphene-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -383,7 +377,7 @@ dependencies = [ [[package]] name = "gsk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "gdk4", @@ -397,7 +391,7 @@ dependencies = [ [[package]] name = "gsk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -412,7 +406,7 @@ dependencies = [ [[package]] name = "gtk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "field-offset", @@ -432,20 +426,18 @@ dependencies = [ [[package]] name = "gtk4-macros" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ - "anyhow", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "gtk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -462,9 +454,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", @@ -472,9 +464,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" @@ -490,9 +482,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -546,9 +538,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "linux-raw-sys" @@ -595,15 +587,15 @@ dependencies = [ [[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 = "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", ] @@ -646,7 +638,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pango" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gio", "glib", @@ -657,7 +649,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "gobject-sys", @@ -790,9 +782,9 @@ dependencies = [ [[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" @@ -815,53 +807,29 @@ 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.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[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", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -871,9 +839,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -882,9 +850,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rustc_version" @@ -897,9 +865,9 @@ 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", "errno", @@ -910,28 +878,28 @@ 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.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -960,26 +928,15 @@ 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 = "syn" -version = "1.0.109" +version = "2.0.62" 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" +checksum = "9f660c3bfcefb88c538776b6685a0c472e3128b51e74d48793dc2a488196e8eb" dependencies = [ "proc-macro2", "quote", @@ -988,9 +945,9 @@ 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", "heck", @@ -1007,9 +964,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -1034,34 +991,34 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.12", ] [[package]] @@ -1086,15 +1043,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.8", ] [[package]] @@ -1105,9 +1062,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[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" @@ -1133,11 +1090,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", ] [[package]] @@ -1157,13 +1114,14 @@ 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", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -1172,45 +1130,51 @@ dependencies = [ [[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" -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" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +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.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" -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" -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" -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" @@ -1223,29 +1187,29 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] [[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 = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] diff --git a/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix index e599b4a779..dcdb5e6b19 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix @@ -9,12 +9,12 @@ , gtk4 , glib , pango -, atk , gdk-pixbuf , shared-mime-info , itstool , poppler -, ghostscriptX +, gnome +, darwin , djvulibre , libspectre , libarchive @@ -29,6 +29,7 @@ , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps , withLibsecret ? true +, supportNautilus ? (!stdenv.isDarwin) , libadwaita , exempi , cargo @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "45.0-unstable-2024-03-27"; + version = "46.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -45,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.gnome.org"; owner = "GNOME/Incubator"; repo = "papers"; - rev = "4374535f4f5e5cea613b2df7b3dc99e97da27d99"; - hash = "sha256-wjLRGENJ+TjXV3JPn/lcqv3DonAsJrC0OiLs1DoNHkc="; + rev = finalAttrs.version; + hash = "sha256-T67d7xHK23CvmT8omEqNZrV5KloK4QXU973dtP9lTDE="; }; cargoRoot = "shell-rs"; @@ -55,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { lockFile = ./Cargo.lock; outputHashes = { - "cairo-rs-0.20.0" = "sha256-aCG9rh/tXqmcCIijuqJZJEgrGdG/IygcdWlvKYzVPhU="; - "gdk4-0.9.0" = "sha256-KYisC8nm6KVfowiKXtMoimXzB3UjHarH+2ZLhvW8oMU="; + "cairo-rs-0.20.0" = "sha256-us8Q1cqHbs0wSfMcRgZx7wTqSagYkLv/aNI8Fle2nNk="; + "gdk4-0.9.0" = "sha256-a+fkiCilKbq7sBHZ9Uvq9a/qqbsVomxG6K07B5f4eYM="; "libadwaita-0.7.0" = "sha256-gfkaj/BIqvWj1UNVAGNNXww4aoJPlqvBwIRGmDiv48E="; }; }; @@ -77,12 +78,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - atk dbus # only needed to find the service directory djvulibre exempi gdk-pixbuf - ghostscriptX glib gtk4 gsettings-desktop-schemas @@ -96,17 +95,33 @@ stdenv.mkDerivation (finalAttrs: { libsecret ] ++ lib.optionals supportXPS [ libgxps + ] ++ lib.optionals supportNautilus [ + gnome.nautilus + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation ]; mesonFlags = [ - "-Dnautilus=false" "-Dps=enabled" ] ++ lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" + ] ++ lib.optionals (!supportNautilus) [ + "-Dnautilus=false" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16" + ) "-Wno-error=incompatible-function-pointer-types"; + preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # Required to open multiple files. + # https://gitlab.gnome.org/GNOME/Incubator/papers/-/issues/176 + --prefix PATH : "$out/bin" + ) + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath "$out/lib" "$out/bin/papers" ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix index 6de1ebd93f..191b405e03 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.0.4"; + version = "5.0.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-1SqrEIoK2ei+HeIXmmk7uF6ZXGpNlYpQcC3Pee7I7yg="; + hash = "sha256-2QiF0qu33f6XQc2Pv1ubppAilsd7L1Ekh3kGZZHvPzI="; }; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix new file mode 100644 index 0000000000..152aa51313 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix @@ -0,0 +1,39 @@ +{ + cmake, + fetchFromGitHub, + gitUpdater, + lib, + ninja, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pegtl"; + version = "3.2.7"; + + src = fetchFromGitHub { + owner = "taocpp"; + repo = "PEGTL"; + rev = finalAttrs.version; + hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/taocpp/pegtl"; + description = "Parsing Expression Grammar Template Library"; + longDescription = '' + Zero-dependency C++ header-only parser combinator library + for creating parsers according to a Parsing Expression Grammar (PEG). + ''; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ vigress8 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch similarity index 74% rename from third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch rename to third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch index f3a34de930..79f44558b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/third_party/nixpkgs/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 672a62a..a5fd1c4 100644 +index fa15faad39e..7670e80931e 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules +@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 672a62a..a5fd1c4 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 672a62a..a5fd1c4 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,71 +30,83 @@ index 672a62a..a5fd1c4 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ else \ @@ -57,6 +61,7 @@ runex19_hypre: ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ else \ @@ -66,6 +71,7 @@ runex19_hypre_cuda: ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ else \ @@ -75,6 +81,7 @@ runex19_hypre_hip: ${RM} -f ex19_1.tmp runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ + -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ else \ @@ -84,6 +91,7 @@ runex19_cuda: ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ else \ @@ -93,6 +101,7 @@ runex19_ml: ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ else \ @@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ else \ @@ -111,6 +121,7 @@ runex19_superlu_dist: ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ else \ @@ -120,6 +131,7 @@ runex19_suitesparse: ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ + echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ else \ +diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile +index d1f047820ec..aab400535dd 100644 +--- a/src/vec/vec/tests/makefile ++++ b/src/vec/vec/tests/makefile +@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules + + runex47: ex47.PETSc + -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ + if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ + echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ + else \ diff --git a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix new file mode 100644 index 0000000000..5a547144b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix @@ -0,0 +1,131 @@ +{ + lib, + stdenv, + fetchzip, + darwin, + gfortran, + python3, + blas, + lapack, + mpiSupport ? true, + mpi, # generic mpi dependency + openssh, # required for openmpi tests + petsc-withp4est ? false, + hdf5-support ? false, + hdf5, + metis, + parmetis, + pkg-config, + p4est, + zlib, # propagated by p4est but required by petsc + petsc-optimized ? false, + petsc-scalar-type ? "real", + petsc-precision ? "double", +}: + +# This version of PETSc does not support a non-MPI p4est build +assert petsc-withp4est -> p4est.mpiSupport; + +stdenv.mkDerivation rec { + pname = "petsc"; + version = "3.21.0"; + + src = fetchzip { + url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; + hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4="; + }; + + inherit mpiSupport; + withp4est = petsc-withp4est; + + strictDeps = true; + nativeBuildInputs = [ + python3 + gfortran + pkg-config + ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh; + buildInputs = [ + blas + lapack + ] ++ lib.optional hdf5-support hdf5 ++ lib.optional withp4est p4est; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool + ''; + + # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): + # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory + # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. + patches = [ ./filter_mpi_warnings.patch ]; + + preConfigure = '' + patchShebangs ./lib/petsc/bin + configureFlagsArray=( + $configureFlagsArray + ${ + if !mpiSupport then + '' + "--with-mpi=0" + '' + else + '' + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + "--with-mpi=1" + "--with-metis=1" + "--with-metis-dir=${metis}" + "--with-parmetis=1" + "--with-parmetis-dir=${parmetis}" + '' + } + ${lib.optionalString withp4est '' + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=-L${zlib}/lib -lz" + ''} + ${lib.optionalString hdf5-support '' + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" + "--with-hdf5-include=${hdf5.dev}/include" + ''} + "--with-blas=1" + "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + ${lib.optionalString petsc-optimized '' + "--with-debugging=0" + COPTFLAGS='-O3' + FOPTFLAGS='-O3' + CXXOPTFLAGS='-O3' + CXXFLAGS='-O3' + ''} + ) + ''; + + hardeningDisable = lib.optionals (!petsc-optimized) [ + "fortify" + "fortify3" + ]; + + configureScript = "python ./configure"; + + enableParallelBuilding = true; + + # This is needed as the checks need to compile and link the test cases with + # -lpetsc, which is not available in the checkPhase, which is executed before + # the installPhase. The installCheckPhase comes after the installPhase, so + # the library is installed and available. + doInstallCheck = true; + installCheckTarget = "check_install"; + + meta = with lib; { + description = "Portable Extensible Toolkit for Scientific computation"; + homepage = "https://petsc.org/release/"; + license = licenses.bsd2; + maintainers = with maintainers; [ cburstedde ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgraphs/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgraphs/package.nix index 0f9e5bc2db..68b01d7ffb 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgraphs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgraphs/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "pgraphs"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "pg-format"; repo = "pgraphs"; rev = "refs/tags/v${version}"; - hash = "sha256-rhNXASSHgdL9knq9uPFhAGlh0ZAKo5TNh/2a4u6Mh1U="; + hash = "sha256-NLQMBEN/wO/xOMy+gX3sQZRqU8gYesXS7hwRGWyjvX0="; }; - npmDepsHash = "sha256-S1pCmRaRuprqIjaylIsuHyguhgQC5vvp7pDq2KJgrHQ="; + npmDepsHash = "sha256-Fj5huWKatJmdH2PUqNWWysE+qhiq7aR2ue723Pv5Y4M="; dontNpmBuild = true; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix new file mode 100644 index 0000000000..732c835edf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ph/photini/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + gitUpdater, +}: + +python3Packages.buildPythonApplication rec { + pname = "photini"; + version = "2024.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jim-easterbrook"; + repo = "Photini"; + rev = "refs/tags/${version}"; + hash = "sha256-iTaFyQpC585QPInLvFzgk65+Znvb1kTTsrzEQvy1quY="; + }; + + build-system = with python3Packages; [ setuptools-scm ]; + dependencies = with python3Packages; [ + pyqt6 + pyqt6-webengine + cachetools + appdirs + chardet + exiv2 + filetype + requests + requests-oauthlib + requests-toolbelt + pyenchant + gpxpy + keyring + pillow + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/jim-easterbrook/Photini"; + changelog = "https://photini.readthedocs.io/en/release-${version}/misc/changelog.html"; + description = "An easy to use digital photograph metadata (Exif, IPTC, XMP) editing application"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ zebreus ]; + mainProgram = "photini"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix index 710a0cf4dc..174b4e853d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix @@ -6,13 +6,13 @@ php.buildComposerProject (finalAttrs: { pname = "phpdocumentor"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; rev = "v${finalAttrs.version}"; - hash = "sha256-//erxY9ryJne/HZLB1l4SwF3EsQ1vmgSe4pZ5xSieIU="; + hash = "sha256-7gW6iqMOcWBaxCFlE5C3K6jjdu5t4lIuL4sXai0Uw9s="; }; vendorHash = "sha256-VNlAzWueF7ZXBpr9RrJghMPrAUof7f1DCh1osFIwFfs="; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix index 1c32aac218..133688d226 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix @@ -7,18 +7,18 @@ let pname = "pinact"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; rev = "v${version}"; - hash = "sha256-ndlyfp+neoOEzofIlQEQp/6masnzMQFWAPmhan3hlb0="; + hash = "sha256-HfeHfKXDBHPgxisWSVnrLOQf/4NXtnehkIjQqiCoFIc="; }; in buildGoModule { inherit pname version src; - vendorHash = "sha256-qu4CHh2013q7e7mBuymlKEhjpdtSOaWGVutjegoVP7E="; + vendorHash = "sha256-L9EGygiJ40f7Yw46KdaAof5O/ren6inTK7XerB/uv1g="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix index ba287be68b..b37b38163a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "piv-agent"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${version}"; - hash = "sha256-aukcnubhB8kbAl22eeFKzLPvVcYdgcEQ1gy3n6KWG00="; + hash = "sha256-M6klwP85Ujd/DtWh4AwCVrqk6GYqxdz0DrnKKbmdtX4="; }; - vendorHash = "sha256-1d6EKEvo4XNDXRtbdnKkqyF9y0LPPHWKu9X/wYnbmas="; + vendorHash = "sha256-L5HuTYA01w3LUtSy7OVxG6QN5uQZ8LVYyrBcJQTkIUA="; subPackages = [ "cmd/piv-agent" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/po/posy-cursors/package.nix b/third_party/nixpkgs/pkgs/by-name/po/posy-cursors/package.nix new file mode 100644 index 0000000000..1b60756919 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/posy-cursors/package.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "posy-cursors"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "simtrami"; + repo = "posy-improved-cursor-linux"; + rev = "refs/tags/${version}"; + hash = "sha256-i0N/QB5uzqHapMCDl6h6PWPJ4GOAyB1ds9qlqmZacLY="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r Posy_Cursor* $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "Posy's Improved Cursors for Linux"; + homepage = "https://github.com/simtrami/posy-improved-cursor-linux"; + platforms = platforms.unix; + license = licenses.unfree; + maintainers = with maintainers; [ mkez ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/po/poutine/package.nix b/third_party/nixpkgs/pkgs/by-name/po/poutine/package.nix index 6ebd925ff2..adf4bede40 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/poutine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/poutine/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "poutine"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; rev = "refs/tags/v${version}"; - hash = "sha256-T81Qi79VaZzfKL4niTZQW+gwwiBcyInALrvyUg1V4Ck="; + hash = "sha256-9vbK2tc57e/YNfhSVbCMxnzOmmahr9T3x5Tt7GQjVnc="; }; - vendorHash = "sha256-/chq40j+puAI3KdI15vbZwrnzCKrU7g+Z/t9aOXQ1Sg="; + vendorHash = "sha256-HYuyGSatUOch73IKc7/9imhwz0Oz6Mrccs2HKVQtaVE="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/po/powerjoular/package.nix b/third_party/nixpkgs/pkgs/by-name/po/powerjoular/package.nix index 62313198f9..213e61c627 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/powerjoular/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/powerjoular/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "powerjoular"; - version = "0.7.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "joular"; repo = pname; rev = version; - hash = "sha256-UjoGY1C58xhINmji7R63wqkWK9yCeXa0wwosnIcfYdA="; + hash = "sha256-3YKoxZTh9ScudAtsE4CJUbcallm7/vvxIdXwaOZt2hA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix index 513227e563..404d647909 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.3.1"; + version = "3.4.0"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc="; + hash = "sha256-6feS9ougTlunkIr1WRUYieR4O8vHN1++VdfX5DreWFg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix new file mode 100644 index 0000000000..2a08500693 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + cmark, + darwin, + extra-cmake-modules, + gamemode, + ghc_filesystem, + jdk17, + kdePackages, + ninja, + nix-update-script, + stripJavaArchivesHook, + tomlplusplus, + zlib, + + msaClientID ? null, + gamemodeSupport ? stdenv.isLinux, +}: + +let + libnbtplusplus = fetchFromGitHub { + owner = "PrismLauncher"; + repo = "libnbtplusplus"; + rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; + hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; + }; +in + +assert lib.assertMsg ( + gamemodeSupport -> stdenv.isLinux +) "gamemodeSupport is only available on Linux."; + +stdenv.mkDerivation (finalAttrs: { + pname = "prismlauncher-unwrapped"; + version = "8.4"; + + src = fetchFromGitHub { + owner = "PrismLauncher"; + repo = "PrismLauncher"; + rev = finalAttrs.version; + hash = "sha256-460hB91M2hZm+uU1tywJEj20oRd5cz/NDvya8/vJdSA="; + }; + + postUnpack = '' + rm -rf source/libraries/libnbtplusplus + ln -s ${libnbtplusplus} source/libraries/libnbtplusplus + ''; + + nativeBuildInputs = [ + cmake + ninja + extra-cmake-modules + jdk17 + stripJavaArchivesHook + ]; + + buildInputs = + [ + cmark + ghc_filesystem + kdePackages.qtbase + kdePackages.quazip + tomlplusplus + zlib + ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] + ++ lib.optional gamemodeSupport gamemode; + + hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; + + cmakeFlags = + [ + # downstream branding + (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") + ] + ++ lib.optionals (msaClientID != null) [ + (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID)) + ] + ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [ + (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5") + ] + ++ lib.optionals stdenv.isDarwin [ + # we wrap our binary manually + (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps") + # disable built-in updater + (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''") + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") + ]; + + dontWrapQtApps = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Free, open source launcher for Minecraft"; + longDescription = '' + Allows you to have multiple, separate instances of Minecraft (each with + their own mods, texture packs, saves, etc) and helps you manage them and + their associated options with a simple interface. + ''; + homepage = "https://prismlauncher.org/"; + changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + minion3665 + Scrumplex + getchoo + ]; + mainProgram = "prismlauncher"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix new file mode 100644 index 0000000000..c6ff689438 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix @@ -0,0 +1,151 @@ +{ + lib, + stdenv, + symlinkJoin, + prismlauncher-unwrapped, + addOpenGLRunpath, + flite, + gamemode, + glfw, + glfw-wayland-minecraft, + glxinfo, + jdk8, + jdk17, + jdk21, + kdePackages, + libGL, + libpulseaudio, + libusb1, + makeWrapper, + openal, + pciutils, + udev, + vulkan-loader, + xorg, + + additionalLibs ? [ ], + additionalPrograms ? [ ], + controllerSupport ? stdenv.isLinux, + gamemodeSupport ? stdenv.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, +}: + +assert lib.assertMsg ( + controllerSupport -> stdenv.isLinux +) "controllerSupport only has an effect on Linux."; + +assert lib.assertMsg ( + textToSpeechSupport -> stdenv.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 + +symlinkJoin { + name = "prismlauncher-${prismlauncher'.version}"; + + 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; + + buildInputs = + [ + kdePackages.qtbase + kdePackages.qtsvg + ] + ++ lib.optional ( + lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.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 + ''; + + qtWrapperArgs = + let + runtimeLibs = + [ + # lwjgl + glfw + libpulseaudio + libGL + openal + stdenv.cc.cc.lib + + vulkan-loader # VulkanMod's lwjgl + + udev # oshi + + xorg.libX11 + xorg.libXext + xorg.libXcursor + xorg.libXrandr + xorg.libXxf86vm + ] + ++ lib.optional textToSpeechSupport flite + ++ lib.optional gamemodeSupport gamemode.lib + ++ lib.optional controllerSupport libusb1 + ++ additionalLibs; + + runtimePrograms = [ + glxinfo + pciutils # need lspci + xorg.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 [ + "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" + "--prefix PATH : ${lib.makeBinPath runtimePrograms}" + ]; + + meta = { + inherit (prismlauncher'.meta) + description + longDescription + homepage + changelog + license + maintainers + mainProgram + platforms + ; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix index bba32dd81a..72b8652bf8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-rust"; - version = "3.2.0"; + version = "3.5.0"; src = fetchCrate { inherit version; pname = "protobuf-codegen"; - sha256 = "sha256-9Rf7GI/qxoqlISD169TJwUVAdJn8TpxTXDNxiQra2UY="; + hash = "sha256-yGZ4auZHGtcsN6n4/FEzabsSXproyhNTJHIwujt7ijg="; }; - cargoSha256 = "sha256-i1ZIEbU6tw7xA1w+ffD/h1HIkOwVep9wQJys9Bydvv0="; + cargoHash = "sha256-RO3kVYkvHw8kwLaRfANtGtz88knjJ8HtmU3i0xgIDMY="; cargoBuildFlags = ["--bin" pname]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix index 960eb6c64a..1d22e7a5d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.17.5"; + version = "1.18.0"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-2dnR/4LpLiQlJebv74/F7L/a5lYPh+AMPqQVIBHvxcg="; + hash = "sha256-dP6mXa5KOK35T3LCL/51/wi/dScqNj6bNYFOl4lCbcY="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix index 8d65ba26b2..3a500fe0c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -1,36 +1,63 @@ -{ lib -, stdenv -, fetchurl -, makeWrapper -, dpkg -, electron +{ + lib, + stdenv, + fetchurl, + makeWrapper, + dpkg, + electron, + unzip, }: let mainProgram = "proton-mail"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "protonmail-desktop"; - version = "1.0.3"; + version = "1.0.4"; - src = fetchurl { - url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; - hash = "sha256-opavVpXQmA/VDZ+K/k0NJFwQHUUJhg+bUm/w8Ertopw="; - }; + src = + { + "x86_64-linux" = fetchurl { + url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; + hash = "sha256-KY/rjiJozOQW27FYljy5N1VKuKroJz3V485DPaH01JY="; + }; + "x86_64-darwin" = fetchurl { + url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-x64-${version}.zip"; + hash = "sha256-I5Yj1JR3DaAmC6WKI4X/d/q9rvmsck9SE3Mx3AY6yvU="; + }; + "aarch64-darwin" = fetchurl { + url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-arm64-${version}.zip"; + hash = "sha256-j1F8hhLSq/C1WQXGrYnvFK8nNz4qwoA1ohNzPsS3tiY="; + }; + } + .${stdenv.hostPlatform.system}; + + sourceRoot = lib.optionalString stdenv.isDarwin "."; dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r usr/share/ $out/ - cp -r usr/lib/proton-mail/resources/app.asar $out/share/ - runHook postInstall - ''; + installPhase = + lib.optionalString stdenv.isLinux '' + runHook preInstall + mkdir -p $out + cp -r usr/share/ $out/ + cp -r usr/lib/proton-mail/resources/app.asar $out/share/ + runHook postInstall + '' + + lib.optionalString stdenv.isDarwin '' + runHook preInstall + mkdir -p $out/{Applications,bin} + cp -r "Proton Mail.app" $out/Applications/ + makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop + runHook postInstall + ''; - preFixup = '' + preFixup = lib.optionalString stdenv.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}}" \ @@ -43,10 +70,13 @@ in stdenv.mkDerivation rec { description = "Desktop application for Mail and Calendar, made with Electron"; homepage = "https://github.com/ProtonMail/inbox-desktop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ rsniezek sebtm ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ + rsniezek + sebtm + matteopacini + ]; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; inherit mainProgram; }; } - diff --git a/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix index 18a9da1fc7..6c08b924f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix @@ -15,14 +15,14 @@ }: let - version = "46.3"; + version = "46.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = version; - hash = "sha256-DKZgnistOv6eFWtqYPtMc1tQJWovCWIqrqGgs9uWu5k="; + hash = "sha256-FIq05EDOEi0qx6s5i5a2T9bacVUMQWe0nl6xUp6CY1s="; }; vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix index 9162724b7a..4ae7590aec 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.3.8"; + version = "2.4.0"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s="; + hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix index 8da36fce01..6ab92197c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.368"; + version = "1.1.369"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-wH+/eMS1KXNJ9Mde9DXBHsPf4phbJaqxvrJfHNBGrDo="; + hash = "sha256-YAv+2QiArHoZrLNisCFaBNhqQm5uHJdtil0w4xtLl4k="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-54MsOZwBZKfdqvBXADeEO5Q2sUfpsObdRbzbBUH5zfE="; + npmDepsHash = "sha256-xnS7guT8E/wHk3d2ESve4HgMPfH/NuP5TsnsGlvQtUI="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-Z8eZaWtBoI2gaYWIIAZjJTdulW+VEWvNdTK4iL8PrFc="; + npmDepsHash = "sha256-ijG0thy0YPPrgMYCJrRqIXkexuHVKcXX7PxPpCJbsg8="; postPatch = '' chmod +w ../../ diff --git a/third_party/nixpkgs/pkgs/by-name/py/pywal16/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pywal16/package.nix new file mode 100644 index 0000000000..bc45201732 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/py/pywal16/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3, + fetchFromGitHub, + imagemagick, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pywal16"; + version = "3.5.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eylles"; + repo = "pywal16"; + rev = "refs/tags/${version}"; + hash = "sha256-14xl0E4zpUCjW8rkqWA87TGsDy8lgqOQm9GeE9JIsVk="; + }; + + nativeBuildInputs = [ python3.pkgs.setuptools ]; + + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + imagemagick + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "pywal" ]; + + meta = { + description = "16 colors fork of pywal"; + homepage = "https://github.com/eylles/pywal16"; + changelog = "https://github.com/eylles/pywal16/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "wal"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix index 1b4c4a29ac..cc01737431 100644 --- a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.10"; + version = "0.10.13"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-2gUvnQjAA0nTeJL4IbsfCmeSD+mGKjywJCCi914f5mM="; + sha256 = "sha256-8j9yn76yGzhqOgQsxpa9TsXU/19IpmZH8PsK2gvybls="; }; - cargoHash = "sha256-M5G5f+aycpIbFaPbkUNalMK3if1PIAXD7MaNsLzdvI4="; + cargoHash = "sha256-RPiwpNY3J07HMORfK+kDiMk1eagvIjm9B5nnuXJp0wk="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix index 5415039d65..adc40aeea3 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-z8mQo9Kl7HvIl+8GDEcuPdRkVmKUX5/V6X4qvRTe6t4="; + hash = "sha256-cZZoGU7v3SKe3dvYUR5T8jKwAkLnDJt+SWYzgMmdJwA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix index 5349581aab..83b44bfc38 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix @@ -6,6 +6,7 @@ cdrtools, curl, gawk, + glxinfo, gnugrep, gnused, jq, @@ -28,7 +29,6 @@ quickemu, testers, installShellFiles, - fetchpatch2, }: let runtimePaths = [ @@ -45,24 +45,26 @@ let qemu socat swtpm - usbutils util-linux unzip - xdg-user-dirs xrandr zsync + ] ++ lib.optionals stdenv.isLinux [ + glxinfo + usbutils + xdg-user-dirs ]; in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; - version = "4.9.4-unstable-2024-05-28"; + version = "4.9.5"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; - rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release - hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8="; + rev = finalAttrs.version; + hash = "sha256-UlpNujF2E8H1zcWTen8D29od60pY8FaGueviT0iwupQ="; }; postPatch = '' @@ -97,13 +99,13 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = testers.testVersion { - version = "4.9.5"; # required for passing tests, TODO: remove when release bump package = quickemu; }; meta = { description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; homepage = "https://github.com/quickemu-project/quickemu"; + changelog = "https://github.com/quickemu-project/quickemu/releases/tag/${finalAttrs.version}"; mainProgram = "quickemu"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix new file mode 100644 index 0000000000..27c2a15cea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix @@ -0,0 +1,79 @@ +{ + asciidoctor, + darwin, + fetchgit, + git, + installShellFiles, + lib, + makeWrapper, + man-db, + rustPlatform, + stdenv, + xdg-utils, +}: +rustPlatform.buildRustPackage rec { + pname = "radicle-httpd"; + version = "0.12.1"; + env.RADICLE_VERSION = version; + + src = fetchgit { + url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; + rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; + hash = "sha256-7576IQRf6Q750LWPon4Iau+YZddSU77VV8lC9C1UozM="; + sparseCheckout = [ "radicle-httpd" ]; + }; + sourceRoot = "${src.name}/radicle-httpd"; + cargoHash = "sha256-3LQhbQxvJ1onGSEzc93Ww79FQCXAB54XcekHg+gHY2Q="; + + nativeBuildInputs = [ + asciidoctor + installShellFiles + makeWrapper + ]; + nativeCheckInputs = [ git ]; + buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + doCheck = stdenv.hostPlatform.isLinux; + + postInstall = '' + for page in $(find -name '*.adoc'); do + asciidoctor -d manpage -b manpage $page + installManPage ''${page::-5} + done + ''; + + postFixup = '' + for program in $out/bin/* ; + do + wrapProgram "$program" \ + --prefix PATH : "${ + lib.makeBinPath [ + git + man-db + xdg-utils + ] + }" + done + ''; + + meta = { + description = "Radicle JSON HTTP API Daemon"; + longDescription = '' + A Radicle HTTP daemon exposing a JSON HTTP API that allows someone to browse local + repositories on a Radicle node via their web browser. + ''; + homepage = "https://radicle.xyz"; + # cargo.toml says MIT and asl20, LICENSE file says GPL3 + license = with lib.licenses; [ + gpl3Only + mit + asl20 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + gador + lorenzleutgeb + ]; + mainProgram = "radicle-httpd"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix new file mode 100644 index 0000000000..8739aa1108 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/raze/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + SDL2, + zmusic, + libvpx, + pkg-config, + makeWrapper, + bzip2, + gtk3, + fluidsynth, + openal, + libGL, + vulkan-loader, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "raze"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "Raze"; + rev = finalAttrs.version; + hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL2 + zmusic + libvpx + bzip2 + gtk3 + fluidsynth + openal + libGL + vulkan-loader + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "DYN_GTK" false) + (lib.cmakeBool "DYN_OPENAL" false) + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/gitinfo.h.in \ + --replace-fail "@Tag@" "${finalAttrs.version}" \ + --replace-fail "@Hash@" "$(cat COMMIT)" \ + --replace-fail "@Timestamp@" "1970-01-01 00:00:01 +0000" + ''; + + postInstall = '' + mv $out/bin/raze $out/share/raze + makeWrapper $out/share/raze/raze $out/bin/raze + 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 + ''; + + meta = { + description = "Build engine port backed by GZDoom tech"; + longDescription = '' + Raze is a fork of Build engine games backed by GZDoom tech and combines + Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave + in a single package. It is also capable of playing Nam and WW2 GI. + ''; + homepage = "https://github.com/ZDoom/Raze"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ qubitnano ]; + mainProgram = "raze"; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix b/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix index 76a05dcea1..a7a313b367 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "DanielChappuis"; repo = "reactphysics3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-LWBnrqDFhpzN/XUEGniZeViDq3R1MtmuU5CMCQ59VOY="; + hash = "sha256-j57wzqAmBV/pK7PPUDXV6ciOCQVs2gX+BaGHk4kLuUI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix index 669cd5a353..fda4439808 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redka"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nalgeon"; repo = "redka"; rev = "v${version}"; - hash = "sha256-URPuAltTh95hXePx5zW/bdP2woAoEsKRpf4DHBwzdw4="; + hash = "sha256-KpfXnhwz3uUdG89XdNqm1WyKwYhA5ImDg4DzzefKMz8="; }; vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; diff --git a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix index 966a989d2b..49c4703aab 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/release-plz/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.73"; + version = "0.3.74"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-QRKXg/6hiF7P3yQ6wFZ5JG2aRaGX7rQU0DB2L97LKsg="; + hash = "sha256-6Cj23OlIVWnuJC4jpmd7o5L4pUSUkTycZbpu8CzSVM0="; }; - cargoHash = "sha256-aDm4hWosaeAI21iw2Uo315u01kjXCK+LaBwt9jlwgYw="; + cargoHash = "sha256-YAijOHu59BWIsS5cYFYbG4zGG0l+x9cqHfEGu3oL5l0="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix index 12d84cb6d4..26d5d36851 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-06-21"; + version = "0-unstable-2024-06-26"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "57a24220c5be33b2974c885bbe2f680c3799f3ce"; - hash = "sha256-0KmJujGcsElzsVU0tsXtXLzh3oL8wBwai8gtxUu02H0="; + rev = "e5e3c4150dd5cdb0d923a0a26d61060d18c77e75"; + hash = "sha256-ZNeKiORQAJxvm+EjzjlJh54YlwEz6F/mGQmdO9nbips="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix index 6fb753a1cb..6b8d276895 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.1+20240615gitdd55f8ea4"; + version = "1.15.1+20240623git05720ced1"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis="; + hash = "sha256-xqAkOBdG1tC7uFDxxG6DzQMs9NqG2QtBXACzEGN44u8="; }; passthru.updateScript = diff --git a/third_party/nixpkgs/pkgs/by-name/re/resources/package.nix b/third_party/nixpkgs/pkgs/by-name/re/resources/package.nix index aa5e1ff47b..82d1f0a24e 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/resources/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/resources/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Udl5DY68AeysYoXVlQQ0cIv3EHOtdqkW1nmGRYXaT8Y="; + hash = "sha256-Xj8c8ZVhlS2h4ZygeCOaT1XHEbgTSkseinofP9X+5qY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-XvCnYBl0pCtJ4vXuQxqBlTVMIiFNQiNabHhqaxq8AdM="; + hash = "sha256-PZ91xSiWt9rMnSy8KZOmWbUL5Y0Nf3Kk577ZwkdnHwg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix index 7040e64b15..b69412bb5e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix @@ -6,17 +6,17 @@ }: buildGoModule rec { pname = "rimgo"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "rimgo"; repo = "rimgo"; rev = "v${version}"; - hash = "sha256-nokXM+lnTiaWKwglmFYLBpnGHJn1yFok76tqb0nulVA="; + hash = "sha256-MSYTupt5f3ZjB84iLBp7bR+/nie1murpONKfXrBCu9Q="; }; - vendorHash = "sha256-wDTSqfp1Bb1Jb9XX3A3/p5VUcjr5utpe6l/3pXfZpsg="; + vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU="; nativeBuildInputs = [ tailwindcss ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index d1218c05c9..8709e0b4de 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-06-16"; + version = "0-unstable-2024-06-27"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "747292e95402298553dec3b2dd923a6c62ad2077"; - hash = "sha256-SWNo6qJNR4XGZc79JQXsab0vppDf1D5GXH/iMmdi5WQ="; + rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82"; + hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/routinator/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix similarity index 62% rename from third_party/nixpkgs/pkgs/servers/routinator/default.nix rename to third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix index 1276bd2731..e7199164dd 100644 --- a/third_party/nixpkgs/pkgs/servers/routinator/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/routinator/package.nix @@ -2,27 +2,23 @@ , rustPlatform , fetchFromGitHub , stdenv -, Security -, SystemConfiguration +, darwin }: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-DCejOfL+c04MABweyuvDLImlYKj/SONxBfXD/4OVzH0="; + hash = "sha256-SUcAhXIPgYGFkUIgSrUJrxwWQvkkmWG/d12hv8+PQI0="; }; - cargoHash = "sha256-X+pAvudfbxng6kMv0NO00v6mMBXUMaXvZb/L1OgWd38="; + cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g="; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ "socks" ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); meta = with lib; { description = "RPKI Validator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix index 8a88b4b202..50e4a41c35 100644 --- a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix @@ -32,10 +32,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16614-5b973448b"; - rpcs3Version = "0.0.32-16614-5b973448b"; - rpcs3Revision = "5b973448bf75a239f34fd9c7698c8a02b04e2ea9"; - rpcs3Hash = "sha256-6rDHOK3KZkLaDcdG6dFlicWLFeuQUhCiRG1Y0grOvmA="; + rpcs3GitVersion = "16648-71524271e"; + rpcs3Version = "0.0.32-16648-71524271e"; + rpcs3Revision = "71524271e948316d57515422bd0da0159a55d24d"; + rpcs3Hash = "sha256-uKzikzl33EBOjmLU3IML6CIfQbRaOs4NYZylSOVo9Dg="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtorrent/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix rename to third_party/nixpkgs/pkgs/by-name/rt/rtorrent/package.nix index bc3989f1ee..c7a74aecf6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/rt/rtorrent/package.nix @@ -1,10 +1,11 @@ { lib , stdenv -, fetchFromGitHub -, autoreconfHook , autoconf-archive +, autoreconfHook , cppunit , curl +, fetchFromGitHub +, installShellFiles , libsigcxx , libtool , libtorrent @@ -13,19 +14,23 @@ , pkg-config , xmlrpc_c , zlib +, nixosTests +, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2022-06-20"; + version = "0.9.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; - hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; + rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09"; + hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ="; }; + outputs = [ "out" "man" ]; + passthru = { inherit libtorrent; }; @@ -33,6 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf-archive autoreconfHook + installShellFiles pkg-config ]; @@ -53,20 +59,26 @@ stdenv.mkDerivation rec { "--with-posix-fallocate" ]; + passthru = { + updateScript = unstableGitUpdater { tagPrefix = "v"; }; + tests = { + inherit (nixosTests) rtorrent; + }; + }; + enableParallelBuilding = true; postInstall = '' - mkdir -p $out/share/man/man1 $out/share/doc/rtorrent - mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + installManPage doc/old/rtorrent.1 + install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc ''; - meta = with lib; { + meta = { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; mainProgram = "rtorrent"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index 71a84c4747..d8f142d2a0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -53,18 +53,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "allo-isolate" -version = "0.1.24" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f5a5fd28223e6f3cafb7d9cd685f51eafdd71d33ca1229f8316925d5957240" +checksum = "f56b7997817c178b853573e8bdfb6c3afe02810b43f17d766d6703560074b0c3" dependencies = [ "anyhow", "atomic", @@ -115,17 +115,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "amf" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -155,7 +144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" dependencies = [ "android_log-sys", - "env_logger 0.10.2", + "env_logger 0.10.0", "log", "once_cell", ] @@ -180,9 +169,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -194,51 +183,88 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[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.190", + "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.190", + "serde_json 1.0.107", +] + +[[package]] +name = "apple-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" +dependencies = [ + "apple-bindgen", + "apple-sdk", + "objc", +] [[package]] name = "arboard" version = "3.3.1" -source = "git+https://github.com/fufesou/arboard?branch=feat/x11_set_conn_timeout#9e6f5357485afc4a4fd817f815c773beca57e1f3" +source = "git+https://github.com/fufesou/arboard?branch=feat/x11_set_conn_timeout#956b5f8693b4fc7fddd7b8cafbe1111a892b34b1" dependencies = [ "clipboard-win", - "core-graphics 0.23.2", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "image", "log", "objc", @@ -263,22 +289,20 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 2.5.3", "futures-core", - "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "flate2", "futures-core", @@ -289,15 +313,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.9.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock 3.3.0", + "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.2", - "futures-lite 2.3.0", + "fastrand 2.0.1", + "futures-lite", "slab", ] @@ -307,10 +331,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock 2.8.0", - "autocfg 1.2.0", + "async-lock", + "autocfg 1.1.0", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] @@ -319,39 +343,20 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock 2.8.0", - "autocfg 1.2.0", + "async-lock", + "autocfg 1.1.0", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite 1.13.0", + "futures-lite", "log", "parking", - "polling 2.8.0", + "polling", "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 1.0.0", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.5.0", - "rustix 0.38.32", - "slab", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "async-lock" version = "2.8.0" @@ -361,58 +366,47 @@ 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-io", + "async-lock", "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.32", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.21", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -420,9 +414,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -432,7 +426,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -487,14 +481,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" @@ -519,9 +513,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[package]] name = "base64" -version = "0.21.7" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -552,6 +552,28 @@ dependencies = [ "which", ] +[[package]] +name = "bindgen" +version = "0.63.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.79", + "quote 1.0.35", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", +] + [[package]] name = "bindgen" version = "0.65.1" @@ -571,28 +593,28 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.57", + "syn 2.0.55", "which", ] [[package]] name = "bindgen" -version = "0.69.4" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cexpr", "clang-sys", - "itertools 0.12.1", "lazy_static", "lazycell", + "peeking_take_while", "proc-macro2 1.0.79", "quote 1.0.35", "regex", "rustc-hash", "shlex", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -609,21 +631,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "bitmask-enum" -version = "2.2.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" +checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163" dependencies = [ "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -674,25 +696,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", - "async-lock 3.3.0", + "async-lock", "async-task", - "fastrand 2.0.2", + "fastrand 2.0.1", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "brotli" -version = "3.5.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -717,9 +739,9 @@ checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" @@ -729,9 +751,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -745,7 +767,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -776,8 +798,8 @@ source = "git+https://github.com/clslaid/cacao?branch=feat/set-file-urls#05e1536 dependencies = [ "bitmask-enum", "block2", - "core-foundation 0.9.3", - "core-graphics 0.23.1", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", + "core-graphics 0.23.1 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "dispatch", "lazy_static", "libc", @@ -793,7 +815,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cairo-sys-rs", "glib 0.18.5", "libc", @@ -814,9 +836,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -861,16 +883,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.18", + "num-traits 0.2.17", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.48.5", ] [[package]] @@ -881,7 +903,7 @@ checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", - "num-traits 0.2.18", + "num-traits 0.2.17", "once_cell", "regex", ] @@ -898,13 +920,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading 0.7.4", ] [[package]] @@ -924,30 +946,30 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.10.0", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard" @@ -964,7 +986,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "thiserror", "utf16string", @@ -974,9 +996,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81" dependencies = [ "error-code", ] @@ -1008,7 +1030,7 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "foreign-types 0.3.2", "libc", @@ -1024,8 +1046,8 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.2", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.5.0", "libc", "objc", @@ -1039,8 +1061,8 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "objc", ] @@ -1069,9 +1091,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1079,10 +1101,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.197", + "serde 1.0.190", "thiserror", "toml 0.5.11", ] @@ -1135,30 +1157,28 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "core-foundation" version = "0.9.3" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", - "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.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.6", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "objc2-encode", +] [[package]] name = "core-graphics" @@ -1167,8 +1187,8 @@ 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", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2", "libc", ] @@ -1179,48 +1199,24 @@ version = "0.23.1" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", - "core-graphics-types 0.1.2", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", + "core-graphics-types 0.1.2 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "foreign-types 0.5.0", "libc", "objc2-encode", ] -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "libc", -] - [[package]] 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", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "libc", "objc2-encode", ] -[[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 = "coreaudio-rs" version = "0.11.3" @@ -1228,17 +1224,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.15" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" dependencies = [ - "bindgen 0.69.4", + "bindgen 0.68.1", ] [[package]] @@ -1248,7 +1244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -1268,64 +1264,74 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ + "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg 1.1.0", + "cfg-if 1.0.0", "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ + "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] [[package]] name = "crunchy" @@ -1355,9 +1361,9 @@ dependencies = [ [[package]] name = "dart-sys" -version = "4.1.5" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" +checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" dependencies = [ "cc", ] @@ -1369,7 +1375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1539,9 +1545,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ "powerfmt", ] @@ -1568,6 +1574,19 @@ dependencies = [ "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 1.0.79", + "quote 1.0.35", + "rustc_version", + "syn 1.0.109", +] + [[package]] name = "digest" version = "0.10.7" @@ -1664,7 +1683,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.1", ] [[package]] @@ -1727,7 +1746,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.197", + "serde 1.0.190", "strsim 0.10.0", ] @@ -1737,12 +1756,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[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" @@ -1756,7 +1769,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "thiserror", ] @@ -1772,15 +1785,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[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", ] @@ -1795,7 +1808,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "tfc", "unicode-segmentation", @@ -1828,28 +1841,28 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -1867,9 +1880,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "humantime", "is-terminal", @@ -1884,7 +1897,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "libc", ] @@ -1896,19 +1909,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "error-code" -version = "3.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "evdev" @@ -1928,57 +1941,15 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" 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 = "exr" version = "1.71.0" @@ -2006,15 +1977,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ "simd-adler32", ] @@ -2025,20 +1996,20 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -2081,7 +2052,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -2112,9 +2083,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "1.82.6" +version = "1.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5" +checksum = "d1ab3d175f0a09c1adb55fd98d7b6460b00af72c4e889b9eec2c5aee88273996" [[package]] name = "fnv" @@ -2158,7 +2129,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -2175,9 +2146,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2224,9 +2195,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2239,9 +2210,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2249,15 +2220,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2266,9 +2237,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2285,47 +2256,34 @@ 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.0.2", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2456,9 +2414,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2477,9 +2435,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -2551,7 +2509,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -2576,7 +2534,7 @@ checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", "heck 0.3.3", - "itertools 0.9.0", + "itertools", "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.79", @@ -2595,7 +2553,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -2646,36 +2604,6 @@ dependencies = [ "system-deps 6.1.2", ] -[[package]] -name = "gpu_common" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "log", - "serde 1.0.197", - "serde_derive", - "serde_json 1.0.115", -] - -[[package]] -name = "gpucodec" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "amf", - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", - "nv", - "serde 1.0.197", - "serde_derive", - "serde_json 1.0.115", - "vpl", -] - [[package]] name = "gstreamer" version = "0.16.7" @@ -2858,14 +2786,14 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2873,7 +2801,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.0.2", "slab", "tokio", "tokio-util", @@ -2895,16 +2823,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.8", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.6", "allocator-api2", ] @@ -2914,17 +2842,19 @@ version = "0.1.0" dependencies = [ "anyhow", "backtrace", + "base64 0.22.0", "bytes", "chrono", "confy", "directories-next", "dirs-next", "dlopen", - "env_logger 0.10.2", + "env_logger 0.10.0", "filetime", "flexi_logger", "futures", "futures-util", + "httparse", "lazy_static", "libc", "log", @@ -2933,22 +2863,27 @@ dependencies = [ "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand 0.8.5", "regex", - "serde 1.0.197", + "rustls-pki-types", + "rustls-platform-verifier", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", "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.8", + "url", "uuid", "winapi 0.3.9", - "zstd 0.13.1", + "zstd 0.13.0", ] [[package]] @@ -2977,9 +2912,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2998,11 +2933,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -3028,7 +2963,7 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa 1.0.9", ] [[package]] @@ -3062,15 +2997,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.2.0" -source = "git+https://github.com/21pages/hwcodec?branch=stable#52e1da2aae86acec5f374bc065f5921945b55e7b" +version = "0.4.18" +source = "git+https://github.com/21pages/hwcodec#b84d5bbefa949194d1fc51a5c7e9d7988e315ce6" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", ] [[package]] @@ -3088,9 +3023,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.11", + "itoa 1.0.9", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3108,7 +3043,7 @@ dependencies = [ "hyper", "rustls 0.21.10", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -3126,16 +3061,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -3149,9 +3084,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3170,7 +3105,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-rational 0.4.1", - "num-traits 0.2.18", + "num-traits 0.2.17", "png", "qoi", "tiff", @@ -3209,18 +3144,18 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "hashbrown 0.12.3", ] [[package]] name = "indexmap" -version = "2.2.6" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.2", ] [[package]] @@ -3267,7 +3202,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.3", "libc", "windows-sys 0.48.0", ] @@ -3280,13 +3215,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.6", - "libc", - "windows-sys 0.52.0", + "hermit-abi 0.3.3", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] @@ -3304,15 +3239,6 @@ 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 = "0.3.4" @@ -3321,9 +3247,9 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -3377,9 +3303,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3395,9 +3321,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3405,11 +3331,12 @@ dependencies = [ [[package]] name = "keepawake" version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" +source = "git+https://github.com/rustdesk-org/keepawake-rs#ad94454a75cf1ff9e95e217dee9dd6a378bf625e" dependencies = [ "anyhow", + "apple-sys", "cfg-if 1.0.0", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "shadow-rs", "windows 0.48.0", "winres", @@ -3432,8 +3359,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", - "serde 1.0.197", + "bitflags 2.4.1", + "serde 1.0.190", "unicode-segmentation", ] @@ -3481,9 +3408,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libdbus-sys" @@ -3518,12 +3445,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -3542,7 +3469,7 @@ dependencies = [ "libc", "libpulse-sys", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "winapi 0.3.9", ] @@ -3575,21 +3502,11 @@ checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "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.5.0", - "libc", -] - [[package]] name = "libsamplerate-sys" version = "0.1.12" @@ -3632,9 +3549,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3644,9 +3561,12 @@ dependencies = [ [[package]] name = "line-wrap" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] [[package]] name = "linux-raw-sys" @@ -3656,9 +3576,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3666,15 +3586,15 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mac_address" @@ -3688,9 +3608,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -3738,9 +3658,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.7.2" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3748,7 +3668,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -3757,16 +3677,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "memoffset" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -3783,9 +3703,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", "simd-adler32", @@ -3803,15 +3723,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "mouce" version = "0.2.1" @@ -3822,13 +3733,12 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +checksum = "e406691fa7749604bbc7964bde28a300572d52621bb84540f6907c0f8fe08737" dependencies = [ "cocoa 0.25.0", "crossbeam-channel", - "dpi", "gtk", "keyboard-types", "libxdo", @@ -3932,9 +3842,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "libc", @@ -3984,7 +3894,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", ] @@ -3999,6 +3909,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -4023,26 +3942,20 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.18", + "num-traits 0.2.17", ] -[[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" @@ -4056,11 +3969,12 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "num-traits 0.2.18", + "autocfg 1.1.0", + "num-traits 0.2.17", ] [[package]] @@ -4069,9 +3983,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] @@ -4080,9 +3994,9 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] @@ -4091,16 +4005,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -4109,7 +4023,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.3", "libc", ] @@ -4136,24 +4050,13 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] -[[package]] -name = "nv" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - [[package]] name = "objc" version = "0.2.7" @@ -4221,9 +4124,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -4238,7 +4141,7 @@ dependencies = [ "ndk", "ndk-context", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "oboe-sys", ] @@ -4253,17 +4156,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types 0.3.2", "libc", @@ -4280,7 +4183,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -4291,9 +4194,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -4341,23 +4244,23 @@ dependencies = [ [[package]] name = "os_info" -version = "3.8.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", - "serde 1.0.197", - "windows-sys 0.52.0", + "serde 1.0.190", + "winapi 0.3.9", ] [[package]] name = "os_pipe" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -4366,9 +4269,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", ] [[package]] @@ -4384,7 +4287,7 @@ dependencies = [ [[package]] name = "pam" version = "0.7.0" -source = "git+https://github.com/fufesou/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" +source = "git+https://github.com/fufesou/pam#3a2aaa6e07b176d8e2d66a5eec38d2ddb45f009f" dependencies = [ "libc", "pam-macros", @@ -4405,11 +4308,10 @@ dependencies = [ [[package]] name = "pam-sys" -version = "1.0.0-alpha5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9484729b3e52c0bacdc5191cb6a6a5f31ef4c09c5e4ab1209d3340ad9e997b" +version = "1.0.0-alpha4" +source = "git+https://github.com/fufesou/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" dependencies = [ - "bindgen 0.69.4", + "bindgen 0.59.2", "libc", ] @@ -4440,13 +4342,12 @@ dependencies = [ [[package]] name = "parity-tokio-ipc" -version = "0.7.3-3" -source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#f2d1fcf8fb002335d9a62bec308559d40698694d" +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", @@ -4476,7 +4377,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -4518,9 +4419,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" @@ -4529,7 +4430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.0.2", ] [[package]] @@ -4572,29 +4473,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4609,35 +4510,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.0.1", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.6.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64", - "indexmap 2.2.6", + "base64 0.21.5", + "indexmap 1.9.3", "line-wrap", - "quick-xml 0.31.0", - "serde 1.0.197", - "time 0.3.34", + "quick-xml", + "serde 1.0.190", + "time 0.3.30", ] [[package]] name = "png" -version = "0.17.13" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4652,7 +4553,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", @@ -4662,20 +4563,6 @@ dependencies = [ "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 1.0.0", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.32", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -4701,7 +4588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2 1.0.79", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -4785,9 +4672,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "bytes", "once_cell", @@ -4797,9 +4684,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78" +checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" dependencies = [ "anyhow", "once_cell", @@ -4812,9 +4699,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d6fbd6697c9e531873e81cec565a85e226b99a0f10e1acc079be057fe2fcba" +checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -4828,9 +4715,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] @@ -4883,65 +4770,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" -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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring 0.16.20", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2 0.4.10", - "tracing", - "windows-sys 0.42.0", -] - [[package]] name = "quote" version = "0.6.13" @@ -5140,8 +4968,8 @@ version = "0.5.0-2" source = "git+https://github.com/fufesou/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" dependencies = [ "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "core-graphics 0.22.3", "dispatch", "enum-map", @@ -5176,6 +5004,24 @@ dependencies = [ "rustfft", ] +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.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" @@ -5187,20 +5033,20 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "libredox", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -5210,9 +5056,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -5221,9 +5067,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "repng" @@ -5241,7 +5087,7 @@ version = "0.11.23" source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" dependencies = [ "async-compression", - "base64", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -5261,54 +5107,39 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.10", - "rustls-native-certs", - "rustls-pemfile", - "serde 1.0.197", - "serde_json 1.0.115", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.3", + "serde 1.0.190", + "serde_json 1.0.107", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.1", "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.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if 1.0.0", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", + "spin", + "untrusted", + "windows-sys 0.48.0", ] [[package]] @@ -5333,23 +5164,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.3.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", "rtoolbox", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] name = "rtoolbox" -version = "0.0.2" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] @@ -5360,7 +5191,7 @@ checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", "realfft", ] @@ -5417,23 +5248,22 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.4" +version = "1.2.6" dependencies = [ "android-wakelock", "android_logger", "arboard", "async-process", "async-trait", - "base64", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.0", + "clap 4.4.7", "clipboard", "cocoa 0.24.1", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "cpal", "crossbeam-queue", @@ -5458,7 +5288,7 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.3", + "libloading 0.8.1", "libpulse-binding", "libpulse-simple-binding", "mac_address", @@ -5477,16 +5307,16 @@ dependencies = [ "repng", "reqwest", "ringbuf", - "rpassword 7.3.1", + "rpassword 7.2.0", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", "serde_repr", "sha2", "shared_memory", @@ -5515,7 +5345,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.2.4" +version = "1.2.6" dependencies = [ "brotli", "dirs 5.0.1", @@ -5526,13 +5356,13 @@ dependencies = [ [[package]] name = "rustfft" -version = "6.2.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" +checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", "primal-check", "strength_reduce", "transpose", @@ -5555,26 +5385,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.13", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "ring 0.16.20", - "sct", - "webpki", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", ] [[package]] @@ -5584,11 +5403,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.8", - "rustls-webpki", + "ring", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -5596,28 +5430,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.3", + "schannel", + "security-framework", +] + +[[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 2.1.2", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64", + "base64 0.21.5", ] +[[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 = "rustls-platform-verifier" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +dependencies = [ + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", + "jni 0.19.0", + "log", + "once_cell", + "rustls 0.23.4", + "rustls-native-certs 0.7.0", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.2", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.1", + "winapi 0.3.9", +] + +[[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.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -5628,9 +5529,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "same-file" @@ -5652,11 +5559,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -5692,7 +5599,6 @@ dependencies = [ "cfg-if 1.0.0", "dbus", "docopt", - "gpucodec", "gstreamer", "gstreamer-app", "gstreamer-video", @@ -5707,8 +5613,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.197", - "serde_json 1.0.115", + "serde 1.0.190", + "serde_json 1.0.107", "target_build_utils", "tracing", "webm", @@ -5721,38 +5627,39 @@ 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]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", ] [[package]] name = "semver" -version = "1.0.22" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" @@ -5762,22 +5669,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -5794,33 +5701,33 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.9", "ryu", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -5830,9 +5737,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.11", + "itoa 1.0.9", "ryu", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -5866,7 +5773,7 @@ dependencies = [ "const_format", "git2", "is_debug", - "time 0.3.34", + "time 0.3.30", "tzdb", ] @@ -5928,14 +5835,14 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "smallvec" -version = "1.13.2" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -5960,12 +5867,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -5977,15 +5884,9 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.197", + "serde 1.0.190", ] -[[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" @@ -6019,12 +5920,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - [[package]] name = "strum" version = "0.18.0" @@ -6092,9 +5987,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.57" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -6122,7 +6017,7 @@ version = "0.29.10" source = "git+https://github.com/rustdesk-org/sysinfo#f45dcc6510d48c3a1401c5a33eedccc8899f67b2" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", "ntapi", "once_cell", @@ -6137,7 +6032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "system-configuration-sys", ] @@ -6147,7 +6042,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", ] @@ -6175,7 +6070,7 @@ dependencies = [ "cfg-expr", "heck 0.4.1", "pkg-config", - "toml 0.8.10", + "toml 0.8.6", "version-compare 0.1.1", ] @@ -6192,13 +6087,13 @@ dependencies = [ [[package]] name = "tao" version = "0.25.0" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "bitflags 1.3.2", "cc", "cocoa 0.25.0", - "core-foundation 0.9.4", - "core-graphics 0.23.2", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "dispatch", "gdkwayland-sys", @@ -6232,7 +6127,7 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -6268,27 +6163,28 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.30.0", + "quick-xml", "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.2", - "rustix 0.38.32", - "windows-sys 0.52.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.4.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6325,22 +6221,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6376,17 +6272,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa 1.0.9", "libc", - "num-conv", "num_threads", "powerfmt", - "serde 1.0.197", + "serde 1.0.190", "time-core", "time-macros", ] @@ -6399,11 +6294,10 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ - "num-conv", "time-core", ] @@ -6424,9 +6318,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", @@ -6436,20 +6330,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.5", "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 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6472,10 +6366,33 @@ dependencies = [ "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.4", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -6499,7 +6416,7 @@ dependencies = [ "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.2", "pin-project-lite", "slab", "tokio", @@ -6512,7 +6429,19 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", +] + +[[package]] +name = "toml" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +dependencies = [ + "serde 1.0.190", + "serde_spanned", + "toml_datetime 0.5.1", + "toml_edit 0.18.1", ] [[package]] @@ -6521,22 +6450,31 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_spanned", - "toml_datetime", + "toml_datetime 0.6.5", "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.8.10" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "toml_edit 0.22.6", + "toml_datetime 0.6.5", + "toml_edit 0.20.7", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +dependencies = [ + "serde 1.0.190", ] [[package]] @@ -6545,7 +6483,20 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", +] + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap 1.9.3", + "nom8", + "serde 1.0.190", + "serde_spanned", + "toml_datetime 0.5.1", ] [[package]] @@ -6554,11 +6505,11 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", - "serde 1.0.197", + "indexmap 2.0.2", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "winnow 0.5.40", + "toml_datetime 0.6.5", + "winnow", ] [[package]] @@ -6567,29 +6518,18 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" -dependencies = [ - "indexmap 2.2.6", - "serde 1.0.197", + "indexmap 2.0.2", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "winnow 0.6.1", + "toml_datetime 0.6.5", + "winnow", ] [[package]] name = "totp-rs" -version = "5.5.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" +checksum = "df3504f96adf86d28e7eb16fa236a7951ec72c15ee100d1b5318e225944bc8cb" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6626,7 +6566,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6650,11 +6590,11 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.1" -source = "git+https://github.com/tauri-apps/tray-icon#3c75d9031a915c108cc1886121b9b84cb9c8c312" +version = "0.11.3" +source = "git+https://github.com/tauri-apps/tray-icon#b8dbd42c6f94a29f34b0a0daa619486277185512" dependencies = [ "cocoa 0.25.0", - "core-graphics 0.23.2", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "dirs-next", "libappindicator", @@ -6713,11 +6653,10 @@ dependencies = [ [[package]] name = "uds_windows" -version = "1.1.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" dependencies = [ - "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -6733,9 +6672,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -6745,9 +6684,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -6776,12 +6715,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -6790,14 +6723,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -6849,9 +6782,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", ] @@ -6894,17 +6827,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "vpl" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - [[package]] name = "waker-fn" version = "1.1.1" @@ -6913,9 +6835,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -6963,9 +6885,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6973,24 +6895,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7000,9 +6922,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -7010,22 +6932,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wayland-backend" @@ -7047,7 +6969,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -7059,7 +6981,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7071,7 +6993,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7085,7 +7007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" dependencies = [ "proc-macro2 1.0.79", - "quick-xml 0.30.0", + "quick-xml", "quote 1.0.35", ] @@ -7102,9 +7024,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -7126,22 +7048,21 @@ dependencies = [ "cc", ] -[[package]] -name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[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.7" @@ -7157,7 +7078,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix 0.38.21", ] [[package]] @@ -7166,7 +7087,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "redox_syscall", + "redox_syscall 0.4.1", "wasite", "web-sys", ] @@ -7225,9 +7146,9 @@ dependencies = [ [[package]] name = "winapi-wsapoll" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" dependencies = [ "winapi 0.3.9", ] @@ -7339,7 +7260,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7350,7 +7271,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7364,21 +7285,6 @@ dependencies = [ "windows-sys 0.45.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" @@ -7648,18 +7554,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.40" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -7786,7 +7683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname 0.4.3", - "rustix 0.38.32", + "rustix 0.38.21", "x11rb-protocol 0.13.0", ] @@ -7807,25 +7704,25 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "libc", + "nix 0.26.4", "winapi 0.3.9", ] [[package]] name = "zbus" -version = "3.15.2" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" 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", @@ -7843,7 +7740,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.197", + "serde 1.0.190", "serde_repr", "sha1", "static_assertions", @@ -7858,9 +7755,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.79", @@ -7872,11 +7769,11 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "static_assertions", "zvariant", ] @@ -7908,7 +7805,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7919,9 +7816,15 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] +[[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" @@ -7938,7 +7841,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.34", + "time 0.3.30", "zstd 0.11.2+zstd.1.5.2", ] @@ -7953,11 +7856,11 @@ 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 7.1.0", + "zstd-safe 7.0.0", ] [[package]] @@ -7972,18 +7875,18 @@ dependencies = [ [[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", @@ -8000,23 +7903,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.197", + "serde 1.0.190", "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.79", diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix index a78290e660..6dedaf3acf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flutter316 , gst_all_1 +, fuse , libXtst , libaom , libopus @@ -14,6 +15,7 @@ , libvpx , libxkbcommon , libyuv +, pam , makeDesktopItem , rustPlatform , rustc @@ -23,7 +25,7 @@ flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.3-2/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.6/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -41,27 +43,27 @@ in flutter316.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.2.3-2"; + version = "1.2.6"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-aIGaj338eb8/l1NTgBwrLmx5VCpgGoYpx+p/ViCJgjQ="; + hash = "sha256-dEHWMtNmYeg2FSocNnzYbcW0f07zhC09G2uSC0yMZcY="; }; strictDeps = true; # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.3-2/flutter/pubspec.lock | yq + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.6/flutter/pubspec.lock | yq pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; - desktop_multi_window = "sha256-jhhqV4srWd3oJwlKMHPpGvvdzyoH/kJtTg6AB4e9Udk="; + desktop_multi_window = "sha256-YXIvTuMDj1Tx8NGtOD2Tpxy1fiQw0p5fbOMZYfKUkXQ="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q="; flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; - uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yTllp5UkGY98="; + uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yT1lp5UkGY98="; window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; }; @@ -69,25 +71,25 @@ in flutter316.buildFlutterApplication rec { # Configure the Rust build cargoRoot = ".."; cargoDeps = rustPlatform.importCargoLock { - # Upstream lock file after running `cargo generate-lockfile --offline` and - # removing the git variant of core-foundation-sys + # Upstream lock file after removing the registry variant of core-foundation-sys + # and fixing the resulting errors by removing the other registry deps. lockFile = ./Cargo.lock; outputHashes = { - "amf-0.1.0" = "sha256-4YVHndc6sCuuHhM2dc1zoOFMZt2J5nUg/UuKYsyiC+A="; "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.3.1" = "sha256-siFkyWK8VmDIhefCaRjNwVtHxRmAp95JvaTp37M6nCA="; + "arboard-3.3.1" = "sha256-Pj111rxyed4/UPtB2w2yDs4R1oZktgGkbEog4o1g5IQ="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "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.2.0" = "sha256-bbAOQui7UY7FFKnwsxFUJYBG/zi9rpmOtcai3faeoeU="; + "hwcodec-0.4.18" = "sha256-RTo83aWx6ZKgWCDic1IFneZZ2TC+ZCfanULeHTfOiec="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; + "keepawake-0.4.3" = "sha256-wDLjjhKWbCeaWbA896a5E5UMB0B/xI/84QRCUYNKX7I="; "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-3" = "sha256-oHygC811v1fXt4KWhIZU04cs4rD340I8/bczfbxpiok="; + "pam-0.7.0" = "sha256-aF3TkRkYuRpBcgg8RyherSfcspKNotvvxRhlg9yGwjk="; + "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="; @@ -95,8 +97,8 @@ in flutter316.buildFlutterApplication rec { "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.13.1" = "sha256-mgWgd9rafDpRFO/6YpsNDE5ZbRqCE2Y1F8PiNznLMyk="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.11.3" = "sha256-pzvrqv+R2AD8fOsTyYItLaJLa19w+lWDa8vNVGczZdY="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; @@ -107,10 +109,10 @@ in flutter316.buildFlutterApplication rec { cargoBuildFlags = "--lib"; cargoBuildType = "release"; cargoBuildFeatures = [ - "linux-pkg-config" - "hwcodec" "flutter" - "flutter_texture_render" + "hwcodec" + "linux-pkg-config" + "unix-file-copy-paste" ]; nativeBuildInputs = [ @@ -125,6 +127,7 @@ in flutter316.buildFlutterApplication rec { ]; buildInputs = [ + fuse gst_all_1.gst-plugins-base gst_all_1.gstreamer libXtst @@ -136,6 +139,7 @@ in flutter316.buildFlutterApplication rec { libvpx libxkbcommon libyuv + pam xdotool ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index d8d6379584..bc1713b597 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -416,7 +416,7 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "ef03db52a20a7899da135d694c071fa3866c8fb1", + "resolved-ref": "60773827434eefe6d01eefa814dca9a032b970b3", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git", @@ -984,14 +984,14 @@ "version": "0.2.1+1" }, "intl": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.1" + "version": "0.19.0" }, "io": { "dependency": "transitive", @@ -1057,21 +1057,21 @@ "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.8.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", + "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.11.0" }, "mime": { "dependency": "transitive", @@ -1147,11 +1147,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.3" + "version": "1.9.0" }, "path_parsing": { "dependency": "transitive", @@ -1903,11 +1903,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.4.2" }, "web_socket_channel": { "dependency": "transitive", diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix new file mode 100644 index 0000000000..1c1920e22d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustmission/package.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rustmission"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "intuis"; + repo = "rustmission"; + rev = "v${version}"; + hash = "sha256-OOewobyfJYnspeXFYzTP7SLrNQRnDl0jv81TJjQAdUE="; + }; + + cargoHash = "sha256-dLddB+YA1uC8CVMVI1aVo1oMufxRupW26hGkb8796Ek="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + # There is no tests + doCheck = false; + + meta = { + description = "A TUI for the Transmission daemon"; + homepage = "https://github.com/intuis/rustmission"; + changelog = "https://github.com/intuis/rustmission/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "rustmission"; + maintainers = with lib.maintainers; [ anas ]; + platforms = with lib.platforms; unix ++ windows; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix index afe4fbca82..b2b7f08ace 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix @@ -122,7 +122,7 @@ buildDotnetModule rec { 2017. ''; license = licenses.mit; - maintainers = with maintainers; [ ivar jk artemist ]; + maintainers = with maintainers; [ jk artemist ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "Ryujinx"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix index ff1447e492..17217e5f8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.14"; + version = "1.0.15"; 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-1LWooboM+vPbft1+Gvg9Cp24RFEeJPG4yvNiexRi/pg="; + hash = "sha256-jN50v0N7wSL/F6qOSjp+nRmooR/mNiebsbe4Iy5YmeM="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix new file mode 100644 index 0000000000..bd35411481 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + asciidoc, + jemalloc, + boost, + fmt, + fuse3, + spdlog, + yaml-cpp, + isa-l, + judy, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "saunafs"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "leil-io"; + repo = "saunafs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rEiiBHB1wRqpnSgFgqVGwA3kOwiDx6MgyTmWyIQHATU="; + }; + + patches = [ + ./sfstool.patch + + ]; + + outputs = [ + "out" + "man" + "dev" + ]; + + nativeBuildInputs = [ + cmake + asciidoc + ]; + buildInputs = [ + fmt + spdlog + yaml-cpp + fuse3 + boost + jemalloc + isa-l + judy + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_WERROR" false) + (lib.cmakeBool "ENABLE_DOC" false) + (lib.cmakeBool "ENABLE_CLIENT_LIB" true) + (lib.cmakeBool "ENABLE_JEMALLOC" true) + ]; + + postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + rm $out/lib/*.a + ''; + + meta = with lib; { + description = "Distributed POSIX file system"; + homepage = "https://saunafs.com"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = [ maintainers.markuskowa ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sa/saunafs/sfstool.patch b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/sfstool.patch new file mode 100644 index 0000000000..90c5f84048 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sa/saunafs/sfstool.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh +index c6c41197..9a59814f 100755 +--- a/src/tools/sfstools.sh ++++ b/src/tools/sfstools.sh +@@ -1,5 +1,6 @@ + #!/usr/bin/env bash + +-tool=$(basename $0) ++tool="$(basename $0)" ++dir="$(dirname $0)" + +-${tool/saunafs/saunafs } "$@" ++$dir/saunafs ${tool/sfs/} "$@" diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scion-apps/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scion-apps/package.nix new file mode 100644 index 0000000000..f4dfd933d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scion-apps/package.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, openpam +}: + +buildGoModule { + pname = "scion-apps"; + version = "unstable-2024-04-05"; + + src = fetchFromGitHub { + owner = "netsec-ethz"; + repo = "scion-apps"; + rev = "cb0dc365082788bcc896f0b55c4807b72c2ac338"; + hash = "sha256-RzWtnUpZfwryOfumgXHV5QMceLY51Zv3KI0K6WLz8rs="; + }; + + vendorHash = "sha256-bz4vtELxrDfebk+00w9AcEiK/4skO1mE3lBDU1GkOrk="; + + postPatch = '' + substituteInPlace webapp/web/tests/health/scmpcheck.sh \ + --replace-fail "hostname -I" "hostname -i" + ''; + + postInstall = '' + # Add `scion-` prefix to all binaries + for f in $out/bin/*; do + filename="$(basename "$f")" + mv -v $f $out/bin/scion-$filename + done + + # Fix nested subpackage names + mv -v $out/bin/scion-server $out/bin/scion-ssh-server + mv -v $out/bin/scion-client $out/bin/scion-ssh-client + + # Include static website for webapp + mkdir -p $out/share + cp -r webapp/web $out/share/scion-webapp + ''; + + buildInputs = [ + openpam + ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Public repository for SCION applications"; + homepage = "https://github.com/netsec-ethz/scion-apps"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scip-go/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scip-go/package.nix new file mode 100644 index 0000000000..f83f9b488d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scip-go/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "scip-go"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "sourcegraph"; + repo = "scip-go"; + rev = "v${version}"; + hash = "sha256-yRYNct1Ok7E57iB01u33QS7ok1kjv6U/7Hm4s/eKKOo="; + }; + + vendorHash = "sha256-R+0E+BnE912vgqUqaaP2dlbbPyJuaCiNxRcedNKGODU="; + + ldflags = [ "-s" "-w" ]; + + doCheck = false; + + meta = with lib; { + description = "SCIP (SCIP Code Intelligence Protocol) indexer for Golang"; + homepage = "https://github.com/sourcegraph/scip-go/tree/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + mainProgram = "scip-go"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix index 7cda586708..be13eff9da 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-9ea0HZErwZ1PZwl1jlC3vafm/QnfhFRLYoFIOhxfY/g="; + hash = "sha256-hqhUtMZ3x4zePEjglHgQbzyqxijZX4q45Q4nsPwSeWc="; }; - cargoHash = "sha256-4SAvx1G5hBi0il7zmlXFSBAxzqLE7Vezo1ZuVccqhms="; + cargoHash = "sha256-Pux0Cqw9ZUrP98ydw7sI0vPZ7w7bcWKTM2FpDv3uzAQ="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/by-name/se/serpl/package.nix b/third_party/nixpkgs/pkgs/by-name/se/serpl/package.nix new file mode 100644 index 0000000000..15d6b6f7ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/serpl/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + gitUpdater, + makeWrapper, + ripgrep, +}: +let + pname = "serpl"; + version = "0.1.26"; +in +rustPlatform.buildRustPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "yassinebridi"; + repo = "serpl"; + rev = version; + hash = "sha256-ppF74VI0ceB4G/RLTa1phEy+tQ34r4hOMxqlK7YeLo0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + cargoHash = "sha256-/TnuRRzeCPp8pqa/soGV0b3ZYp0cCbt3un6SjatSGp0="; + + postFixup = '' + # Serpl needs ripgrep to function properly. + wrapProgram $out/bin/serpl \ + --prefix PATH : "${lib.strings.makeBinPath [ ripgrep ]}" + ''; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Simple terminal UI for search and replace, ala VS Code"; + homepage = "https://github.com/yassinebridi/serpl.git"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; + mainProgram = "serpl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sf/sfwbar/package.nix b/third_party/nixpkgs/pkgs/by-name/sf/sfwbar/package.nix index 7120403335..d7b7371b9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sf/sfwbar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sf/sfwbar/package.nix @@ -13,9 +13,10 @@ libxkbcommon, alsa-lib, makeWrapper, + docutils, }: let - version = "1.0_beta14"; + version = "1.0_beta15"; in stdenv.mkDerivation { pname = "sfwbar"; @@ -25,7 +26,7 @@ stdenv.mkDerivation { owner = "LBCrion"; repo = "sfwbar"; rev = "v${version}"; - hash = "sha256-4brP1SXaWq/L0D87rvlrWhLU1oFPSwNNxBSzRr4jsTM="; + hash = "sha256-nNtnHOM/ArbYx5ZGlnxgMB33YaGAOigxgW4SAywg66Q="; }; buildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation { libmpdclient libxkbcommon alsa-lib + docutils # for rst2man ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix index 577288bb12..aaebb00db0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.47"; + version = "0.4.48"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-9XCKrT+fOkC7Ft1/pGEgHjv3suXOf5NKYWqS702DtOA="; + hash = "sha256-pHafNKaaxgH4nXfcMwQpWYCSoEFIPwlA+5llilnpGhs="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-W/lIPcbCcHs+xRzAO8R49AE6oFLTLc6Ca5UlIdMLO5A="; + vendorHash = "sha256-wGOF4hCdKSqpo6wp3kbOR/XEnXFDXMlPCoMtl6/TZWM="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix index 35aa50865d..280ddc639f 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "7.0.4"; + version = "7.0.6"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-yu0f2NyHj+5UR1YKD+eZIksBWtykTN6/Pcam1pfyQTM="; + hash = "sha256-WsjUXHbl3HTOrXSeNJrykHv9x5Kbch5GH4yOFKYf+jU="; }; - vendorHash = "sha256-+h4jj8VBDQ76V3udrr4e54jhRwjsbxqgAtntILCAHy8="; + vendorHash = "sha256-qAypUevd4qGt5WFYfuVx00nRKdk2qf9a0T6l/la8mpA="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix index 36db7162d8..7c0d7e2737 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix @@ -46,7 +46,6 @@ buildGoModule rec { homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - jonringer mdarocha ]; mainProgram = "spicetify"; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix index 86124dfe77..eccf87258a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix @@ -22,13 +22,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; stdenv.mkDerivation rec { pname = "spla"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "eth-cscs"; repo = pname; rev = "v${version}"; - hash = "sha256-1k9Su7loXsH7AyhYFZax+4nyNoCO5+WJbXrzGGAIy/c="; + hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/sploitscan/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/sploitscan/package.nix index 85477ba19b..183832f099 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/sploitscan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/sploitscan/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sploitscan"; - version = "0.9.1"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "xaitax"; repo = "SploitScan"; rev = "refs/tags/v${version}"; - hash = "sha256-l2nLqQoM5TuOezobipBV+s/nXTw37xhop/xpipLL1Bs="; + hash = "sha256-UsCGmOjrfk5qsSsnWHEbS3boiC2RFb0Za++yBcCfdJY="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix index 5d567669a1..f2f9cbc23d 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix @@ -19,7 +19,7 @@ let pname = "spotube"; - version = "3.6.0"; + version = "3.7.1"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -53,7 +53,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-Qsr+66ToyLCCUwirj/7V6vzSNmx7BZ3O34liLx6AdlI="; + hash = "sha256-EYgjVXO/ztIsVYzEHe14YgXbQTclQIht9Qqr8ewHU8w="; }; sourceRoot = "."; @@ -77,7 +77,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-dSFtjCuufrg5tG+FLgLgdx20WpO2s4wGOPtK+tel3dg="; + hash = "sha256-JKp2RMYNfdBzywqlBpTaHL1iD+E71EL8xY+nzkdA3us="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sr/srm-cuarzo/package.nix b/third_party/nixpkgs/pkgs/by-name/sr/srm-cuarzo/package.nix index af1468b428..0580a22990 100644 --- a/third_party/nixpkgs/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.7-1"; + version = "0.6.0-1"; rev = "v${self.version}"; - hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc="; + hash = "sha256-guC2NLIg0NGyflgtrl5X2FiDKCwKd/7mglMEn56uF3Q="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix index a85e7d36f9..d03e07ffc1 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.18"; + version = "2.10.19"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8="; + hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/st/status-im/package.nix b/third_party/nixpkgs/pkgs/by-name/st/status-im/package.nix new file mode 100644 index 0000000000..040d43d24c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/status-im/package.nix @@ -0,0 +1,49 @@ +{ + lib, + appimageTools, + fetchzip, + fetchurl, + makeDesktopItem, +}: +let + version = "2.29.0"; + commit = "f78ece"; + + 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="; + stripRoot = false; + postFetch = '' + mv $out/StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage $TMPDIR/tmp + rm -rf $out + mv $TMPDIR/tmp $out + ''; + }; + + desktopEntry = makeDesktopItem { + name = "status"; + desktopName = "Status Desktop"; + exec = "status-desktop"; + icon = "status"; + comment = "Desktop client for the Status Network"; + categories = ["Network"]; + }; + icon = fetchurl { + url = "https://github.com/status-im/status-desktop/raw/afde83651724a555626b5d9a3d582918de6c3d59/status.png"; + sha256 = "sha256-ViGuOr9LskGs/P7pjPO9zYgosWaZlZZYVuPpliOA5dY="; + }; + pname = "status-desktop"; +in appimageTools.wrapType2 { + inherit pname version src; + extraInstallCommands = '' + install -m 444 -D ${desktopEntry}/share/applications/status.desktop $out/share/applications/status.desktop + install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/status.png + ''; + meta = with lib; { + description = "Desktop client for the Status Network"; + license = licenses.mpl20; + maintainers = with maintainers; [ a-kenji ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix b/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix index 95d11ba10a..326feb08af 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; rev = "refs/tags/${version}"; - hash = "sha256-T2xFMExRas7mxfjmAZnv3kiHdc+eEFdCf7TG1ABzgWM="; + hash = "sha256-1zURXE3y6um1wYu4Di7G4mrU5sl9QIY1HKEQlni+aEg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix index 7c9256b2ae..4d2a508cf7 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-XBg/t2hspKdgkRgU95VLfi74cnA9OZ03x4deFOu+2do="; + hash = "sha256-VEfMkUMrn9yKMg1M56uFhM8ego3EyY1MqEgzkZE6Zbk="; }; - vendorHash = "sha256-OuPPK4ordP/yzH+0sCRKO9szJ81LUbvM2Z8U88O6Qwc="; + vendorHash = "sha256-L3XKjJSk/1Evzq4ieUsJ4ewyfS8NDDSd10aDdsc5IcI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix new file mode 100644 index 0000000000..2bf7195d83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/stylelint-lsp/package.nix @@ -0,0 +1,61 @@ +{ + bash, + fetchFromGitHub, + lib, + nodejs, + pnpm_9, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "stylelint-lsp"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "bmatcuk"; + repo = "stylelint-lsp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mzhY6MKkXb1jFYZvs/VkGipBjBfUY3GukICb9qVQI80="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-/QJ4buPOt5KFJxwsQp7L9WYE1RtODj4LMq21l99QwhA="; + }; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/${finalAttrs.pname}} + mv {dist,node_modules} $out/lib/${finalAttrs.pname} + echo " + #!${lib.getExe bash} + ${lib.getExe nodejs} $out/lib/${finalAttrs.pname}/dist/index.js \$@ + " > $out/bin/stylelint-lsp + chmod +x $out/bin/stylelint-lsp + + runHook postInstall + ''; + + meta = with lib; { + description = "A stylelint Language Server"; + homepage = "https://github.com/bmatcuk/stylelint-lsp"; + license = licenses.mit; + maintainers = with maintainers; [ gepbird ]; + mainProgram = "stylelint-lsp"; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix new file mode 100644 index 0000000000..2da3cc58dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/su/supermariowar/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + enet, + yaml-cpp, + SDL2, + SDL2_image, + SDL2_mixer, + zlib, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "supermariowar"; + version = "2.0-unstable-2024-06-22"; + + src = fetchFromGitHub { + owner = "mmatyas"; + repo = "supermariowar"; + rev = "e646679c119a3b6c93c48e505564e8d24441fe4e"; + hash = "sha256-bA/Pu47Rm1MrnJHIrRvOevI3LXj207GFcJloP94/LOA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + enet + yaml-cpp + SDL2 + SDL2_image + SDL2_mixer + zlib + ]; + + cmakeFlags = [ "-DBUILD_STATIC_LIBS=OFF" ]; + + postInstall = '' + mkdir -p $out/bin + + for app in smw smw-leveledit smw-worldedit; do + chmod +x $out/games/$app + + cat << EOF > $out/bin/$app + $out/games/$app --datadir $out/share/games/smw + EOF + chmod +x $out/bin/$app + done + + ln -s $out/games/smw-server $out/bin/smw-server + ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { + description = "A fan-made multiplayer Super Mario Bros. style deathmatch game"; + homepage = "https://github.com/mmatyas/supermariowar"; + changelog = "https://github.com/mmatyas/supermariowar/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "smw"; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix index 53290ea042..69278f94be 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/surrealist/package.nix @@ -8,9 +8,9 @@ , gobject-introspection , lib , libsoup -, llvmPackages_15 , makeBinaryWrapper , nodejs +, openssl , pango , pkg-config , pnpm @@ -18,13 +18,12 @@ , rustPlatform , stdenv , stdenvNoCC -, wasm-bindgen-cli , webkitgtk }: let - esbuild-18-20 = let version = "0.18.20"; + esbuild-20-2 = let version = "0.20.2"; in esbuild.override { buildGoModule = args: buildGoModule (args // { @@ -33,99 +32,59 @@ let owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; - wasm-bindgen-cli-2-92 = wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; - }; - in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "1.11.7"; + version = "2.0.6"; src = fetchFromGitHub { - owner = "StarlaneStudios"; - repo = "Surrealist"; - rev = "v${finalAttrs.version}"; - hash = "sha256-1jTvbr7jFo2GOB79ClwtBVVnNQlSEkqY2eqbiZxWG74="; + owner = "surrealdb"; + repo = "surrealist"; + rev = "surrealist-v${finalAttrs.version}"; + hash = "sha256-5OiVqn+ujssxXZXC6pnGiG1Nw8cAhoDU5IIl9skywBw="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - embed = stdenv.mkDerivation { - inherit (finalAttrs) src version; - pname = "${finalAttrs.pname}-embed"; - sourceRoot = "${finalAttrs.src.name}/src-embed"; - auditable = false; - dontInstall = true; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/src-embed"; - hash = "sha256-0cAhaeoP8EPcE1230CyznQZZIKRs0lrI8XOXECgb8pg="; - }; - - nativeBuildInputs = [ - cargo - rustc - llvmPackages_15.clangNoLibc - llvmPackages_15.lld - rustPlatform.cargoSetupHook - wasm-bindgen-cli-2-92 - ]; - - postBuild = '' - CC=clang cargo build \ - --target wasm32-unknown-unknown \ - --release - - wasm-bindgen \ - target/wasm32-unknown-unknown/release/surrealist_embed.wasm \ - --out-dir $out \ - --out-name surrealist-embed \ - --target web - ''; - }; - ui = stdenvNoCC.mkDerivation { inherit (finalAttrs) src version; pname = "${finalAttrs.pname}-ui"; - dontFixup = true; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-3x/GKgVX0mnxTZmINe/qTtr/vI0h5IqPYt9N0l/VGzg="; + hash = "sha256-apvU7nanzueaF7PEQL7EKjVT5z1M6I7PZpEIJxfKuCQ="; }; - ESBUILD_BINARY_PATH = "${lib.getExe esbuild-18-20}"; + ESBUILD_BINARY_PATH = "${lib.getExe esbuild-20-2}"; nativeBuildInputs = [ nodejs pnpm.configHook ]; - postPatch = '' - ln -s ${finalAttrs.embed} src/generated - ''; + buildPhase = '' + runHook preBuild - postBuild = '' pnpm build + + runHook postBuild ''; - postInstall = '' + installPhase = '' + runHook preInstall + cp -r dist $out + + runHook postInstall ''; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "tauri-plugin-localhost-0.1.0" = - "sha256-7PJgz6t/jPEwX/2xaOe0SYawfPSZw/F1QtOrc6iPiP0="; - }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src sourceRoot version; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-uE4r0smgSbl4l77/MsHtn1Ar5fqspsYcLC/u8TUrcu8="; }; nativeBuildInputs = [ @@ -138,12 +97,16 @@ in stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - [ cairo gdk-pixbuf gobject-introspection libsoup pango webkitgtk ]; + [ cairo gdk-pixbuf gobject-introspection libsoup openssl pango webkitgtk ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; postPatch = '' substituteInPlace ./tauri.conf.json \ - --replace '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \ - --replace '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' + --replace-fail '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' ''; postBuild = '' @@ -160,14 +123,11 @@ in stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "Powerful graphical SurrealDB query playground and database explorer for Browser and Desktop"; - homepage = "https://surrealist.starlane.studio"; + description = "Surrealist is the ultimate way to visually manage your SurrealDB database"; + homepage = "https://surrealdb.com/surrealist"; license = licenses.mit; mainProgram = "surrealist"; maintainers = with maintainers; [ frankp ]; platforms = platforms.linux; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix index e3c9cf5321..31402d58fa 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-fTqyFsFWSsVt2Thd15nlsmnNIhQSLAv9SaaaVJWto/8="; + hash = "sha256-S61O/JxVu60GS/T9jVBuebn+EFBwB5jiSEkKV/h/S+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; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-U4PZPUsfWCJB2YFJkirF8Q46pRmhKqzSnk7GpKOrfbU="; + vendorHash = "sha256-WSDbTI0U3Vqkfy8fxuqq9G5uBnBQ3421vyn6RriQx/U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syshud/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syshud/package.nix new file mode 100644 index 0000000000..a22f8ea1b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/syshud/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gtk4-layer-shell, + gtkmm4, + nix-update-script, + pkg-config, + wireplumber, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "syshud"; + version = "0-unstable-2024-06-20"; + + src = fetchFromGitHub { + owner = "System64fumo"; + repo = "syshud"; + rev = "2b97f3441970efe67c788a8313eb58182aa7965b"; + hash = "sha256-XPAKjBLaTGEyDgiZT8tYinYzMivOocOEeauzR4leOjI="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'pkg-config' ''${PKG_CONFIG} + ''; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4-layer-shell + gtkmm4 + wireplumber + ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + + # populate version info used by `syshud -v`: + configurePhase = '' + runHook preConfigure + + echo '#define GIT_COMMIT_MESSAGE "${finalAttrs.src.rev}"' >> src/git_info.hpp + echo '#define GIT_COMMIT_DATE "${lib.removePrefix "0-unstable-" finalAttrs.version}"' >> src/git_info.hpp + + runHook postConfigure + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version" "branch" ]; + }; + + meta = { + description = "simple heads up display written in gtkmm 4"; + mainProgram = "syshud"; + homepage = "https://github.com/System64fumo/syshud"; + license = lib.licenses.wtfpl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ colinsane ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 316169bdf8..a7d1a466b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.0.16"; + version = "0.0.18"; in buildNpmPackage { pname = "tailwindcss-language-server"; @@ -19,11 +19,11 @@ buildNpmPackage { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; rev = "@tailwindcss/language-server@v${version}"; - hash = "sha256-azzWrT8Ac+bdEfmNo+9WfQgHwA3+q9yGZMLfYXAQHtU="; + hash = "sha256-A2P7AzFciVpXEWOH6hu2+TYKTn23z1iS8mmD0nvsR2Y="; }; makeCacheWritable = true; - npmDepsHash = "sha256-z2fLtGnYgI8ocWTBrqpdElgjNghoE42LFJRWyVt/U7M="; + npmDepsHash = "sha256-/vr7PCohzw4QEEOx6+7IAzBM4xC2nxvNb3PLtSUT7YM="; npmWorkspace = "packages/tailwindcss-language-server"; buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix b/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix index e6c339d1e1..83e9687c2a 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tdnf"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "vmware"; repo = "tdnf"; rev = "v${finalAttrs.version}"; - hash = "sha256-gj0IW0EwWBXi2s7xFdghop8f1lMhkUJVAkns5nnl7sg="; + hash = "sha256-+oVmIZqWi1JdiOv40C4dS2a9VqK3hzGl+PQ7sk1l11o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix b/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix index 368c15d7e6..78e0da449c 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/telescope/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.9.1"; + version = "0.10"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-OAqXYmlehL9AjZ7V0U0h7RCm/hn77Sf0Wp6R/GRaGY8="; + hash = "sha256-hkXXM/I7sNFomWamT0q1JH62arX1hFbt68Axcijadug="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/te/televido/package.nix b/third_party/nixpkgs/pkgs/by-name/te/televido/package.nix index 2b49560061..f2c31bb949 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/televido/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/televido/package.nix @@ -16,19 +16,19 @@ stdenv.mkDerivation rec { pname = "televido"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "d-k-bo"; repo = "televido"; rev = "v${version}"; - hash = "sha256-qfUwPyutBNEnplD3kmTJXffzcWkEcR6FTLnT5YDSysU="; + hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-CmQQH6a5xMq+v+P4/sbpQ7iDaGKtzV39FgufD5uxz4Y="; + hash = "sha256-wavxkhDS0hspGMw5ZKTxjZ07TiZ67OkbMhicB8h5y64="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix index 800bea1565..3796065194 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "2.1.8"; + version = "2.2.1"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-9wY+9lAbrnwiXpLilMaqtQz0XmMGRMv+m+yR7BxmSsw="; + hash = "sha256-je+T+Kbin0O7CuTRSsv3u+3IWLahTRn8io7yasubLM8="; }; vendorHash = "sha256-v1NWlZhfypoS+bZCtr+P2s1t4qYVncbjx9IyRhi2sa4="; diff --git a/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix b/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix index fffb4221ef..cc5b898985 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix @@ -1,20 +1,27 @@ { lib , buildGoModule , fetchFromGitHub +, go-mockery }: buildGoModule rec { pname = "terragrunt"; - version = "0.58.2"; + version = "0.59.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bcn3wwhAzbdO3XBrLKApAurpnpRcVJLWo6C9x/n3Nz0="; + hash = "sha256-3tXhv/W8F9ag5G7hOjuS7AOU0sdpjdasedhPgMQAV0k="; }; - vendorHash = "sha256-ZuOgbwE32yFXPn+AqlQ397a4UZ+MWuj5ppCrDGnC3og="; + nativeBuildInputs = [ go-mockery ]; + + preBuild = '' + make generate-mocks + ''; + + vendorHash = "sha256-a/pWEgEcT8MFES0/Z1vFCnbSaI47ZIVjhWZbvMC/OJk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/th/thc-secure-delete/package.nix b/third_party/nixpkgs/pkgs/by-name/th/thc-secure-delete/package.nix new file mode 100644 index 0000000000..03539ffcb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/th/thc-secure-delete/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "thc-secure-delete"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "gordrs"; + repo = "thc-secure-delete"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hvWuxFkzhOSCplPtyjRtn36bIk6KdPBcpr3lAmiAyfE="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin/ -m755 srm sdmem sswap sfill + installManPage *.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "THC's Secure Delete tools"; + homepage = "https://github.com/gordrs/thc-secure-delete"; + changelog = "https://github.com/gordrs/thc-secure-delete/blob/v${finalAttrs.version}/CHANGES"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tochiaha ]; + mainProgram = "srm"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix new file mode 100644 index 0000000000..538b157dbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ti/tidgi/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + unzip, +}: +stdenv.mkDerivation rec { + pname = "tidgi"; + version = "0.9.6"; + + src = + if stdenv.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="; + } + else + fetchurl + { + url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-x64-${version}.zip"; + sha256 = "sha256-5jHW/QrgzsGQfX4LvsRebdOJPzYTvhtC5mczxp2wPI8="; + }; + + dontBuild = true; + + nativeBuildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/tag/v${version}"; + description = "Customizable personal knowledge-base and blogging platform with git as backup manager"; + homepage = "https://github.com/tiddly-gittly/TidGi-Desktop"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [klchen0112]; + platforms = ["aarch64-darwin" "x86_64-darwin"]; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock index ae658912bf..6d7f036cc7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/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", ] @@ -102,9 +102,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", ] @@ -121,15 +121,15 @@ 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 = "append-only-vec" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" +checksum = "a6cf1d5134ae83736dc3f4dc3e6107870b29cc2a9f8f7948630c133c6fdb6ba1" [[package]] name = "approx" @@ -140,6 +140,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "archery" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8967cd1cc9e9e1954f644e14fbd6042fe9a37da96c52a67e44a2ac18261f8561" +dependencies = [ + "static_assertions", + "triomphe", +] + [[package]] name = "arraydeque" version = "0.5.1" @@ -164,6 +174,26 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "async-lsp" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "855d6246a5d31e6e469eeef718d9a098f2d99207985a00dfdd3f4b5c5003c09a" +dependencies = [ + "futures", + "lsp-types", + "pin-project-lite", + "rustix", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower-layer", + "tower-service", + "tracing", + "waitpid-any", +] + [[package]] name = "async-trait" version = "0.1.80" @@ -172,7 +202,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -207,9 +237,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[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", @@ -250,7 +280,7 @@ checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" dependencies = [ "numerals", "paste", - "strum 0.26.2", + "strum 0.26.3", "unicode-normalization", "unscanny", ] @@ -287,9 +317,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", ] @@ -361,9 +391,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -411,9 +441,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" dependencies = [ "jobserver", "libc", @@ -498,9 +528,9 @@ 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", @@ -508,9 +538,9 @@ dependencies = [ [[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", @@ -523,18 +553,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "fbca90c87c2a04da41e95d1856e8bcd22f159bdbfa147314d2ce5218057b0e58" dependencies = [ "clap", ] [[package]] name = "clap_complete_fig" -version = "4.5.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110" +checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" dependencies = [ "clap", "clap_complete", @@ -542,27 +572,27 @@ 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.64", + "syn 2.0.68", ] [[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 = "clap_mangen" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +checksum = "74b70fc13e60c0e1d490dc50eb73a749be6d81f4ef03783df1d9b7b0c62bc937" dependencies = [ "clap", "roff", @@ -637,7 +667,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -648,7 +678,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -699,18 +729,18 @@ dependencies = [ [[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", ] @@ -745,9 +775,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" @@ -831,7 +861,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -853,7 +883,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -992,13 +1022,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.64", + "syn 2.0.68", ] [[package]] @@ -1027,9 +1057,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" [[package]] name = "elsa" @@ -1093,7 +1123,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -1333,7 +1363,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -1418,9 +1448,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 = "git2" @@ -1428,7 +1458,7 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -1596,9 +1626,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" @@ -1614,9 +1644,9 @@ 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", @@ -1694,9 +1724,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ "displaydoc", "serde", @@ -1707,9 +1737,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", @@ -1720,9 +1750,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", "icu_locid", @@ -1734,15 +1764,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" [[package]] name = "icu_properties" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ "displaydoc", "icu_collections", @@ -1756,15 +1786,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] name = "icu_provider" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ "displaydoc", "icu_locid", @@ -1781,9 +1811,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" dependencies = [ "icu_locid", "icu_locid_transform", @@ -1794,9 +1824,9 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" +checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" dependencies = [ "icu_provider", "postcard", @@ -1808,20 +1838,20 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] name = "icu_segmenter" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" dependencies = [ "core_maths", "displaydoc", @@ -1836,9 +1866,9 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" [[package]] name = "ident_case" @@ -2108,9 +2138,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" @@ -2142,15 +2172,15 @@ 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", ] [[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", "libc", @@ -2188,9 +2218,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" dependencies = [ "serde", ] @@ -2238,9 +2268,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" @@ -2269,9 +2299,9 @@ dependencies = [ [[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", @@ -2303,11 +2333,10 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[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", @@ -2331,7 +2360,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2346,9 +2375,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", @@ -2405,9 +2434,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[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", ] @@ -2420,9 +2449,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.3" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" +checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" dependencies = [ "is-wsl", "libc", @@ -2435,7 +2464,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -2452,7 +2481,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -2500,14 +2529,14 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[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", @@ -2521,7 +2550,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -2592,7 +2621,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -2627,7 +2656,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -2740,9 +2769,9 @@ dependencies = [ [[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", ] @@ -2868,11 +2897,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2888,9 +2917,9 @@ dependencies = [ [[package]] name = "reflexo" -version = "0.5.0-rc4" +version = "0.5.0-rc5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803cbdda7d5beefc048966f342ba9a13dab586f136a8fe7f6d915b2f073a9151" +checksum = "6ae5af71dba0ab175d7e790ef57f64310c645dc300e88794bd22457d531fbc23" dependencies = [ "base64 0.22.1", "bitvec", @@ -2898,10 +2927,12 @@ dependencies = [ "dashmap", "ecow 0.2.2", "fxhash", + "instant", "once_cell", "parking_lot", "path-clean", "rkyv", + "rustc-hash", "serde", "serde_json", "serde_repr", @@ -2911,10 +2942,63 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.10.4" +name = "reflexo-vfs" +version = "0.5.0-rc5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "acc80c7f1483dfc8ef7f413a2158181d7c8ecd18d22241c533ec2cd493d1bc0f" +dependencies = [ + "append-only-vec", + "indexmap 2.2.6", + "log", + "nohash-hasher", + "once_cell", + "parking_lot", + "reflexo", + "rpds", + "rustc-hash", + "typst", +] + +[[package]] +name = "reflexo-world" +version = "0.5.0-rc5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68eb0f8f91035cbe75c17f42542be883aed8738e39b79a28c9a532b141127c5f" +dependencies = [ + "append-only-vec", + "chrono", + "codespan-reporting", + "comemo 0.4.0", + "dashmap", + "dirs", + "flate2", + "fontdb", + "hex", + "indexmap 2.2.6", + "log", + "nohash-hasher", + "notify", + "once_cell", + "parking_lot", + "reflexo", + "reflexo-vfs", + "reqwest", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "strum 0.25.0", + "tar", + "typst", + "typst-ts-core", + "walkdir", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2924,9 +3008,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", @@ -2935,9 +3019,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 = "rend" @@ -3075,6 +3159,15 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "rpds" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4" +dependencies = [ + "archery", +] + [[package]] name = "rust_iso3166" version = "0.1.13" @@ -3125,7 +3218,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", @@ -3175,7 +3268,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "smallvec", "ttf-parser", @@ -3237,7 +3330,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3265,29 +3358,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", @@ -3302,7 +3395,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -3353,7 +3446,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -3536,11 +3629,11 @@ 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 0.26.2", + "strum_macros 0.26.4", ] [[package]] @@ -3553,20 +3646,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.64", + "syn 2.0.68", ] [[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.64", + "syn 2.0.68", ] [[package]] @@ -3613,9 +3706,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.64" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3636,7 +3729,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -3690,9 +3783,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", @@ -3743,7 +3836,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.11" +version = "0.11.12" dependencies = [ "insta", "lsp-server", @@ -3770,7 +3863,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -3840,10 +3933,12 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.11" +version = "0.11.12" dependencies = [ "anyhow", + "async-lsp", "async-trait", + "await-tree", "base64 0.22.1", "cargo_metadata", "chrono", @@ -3858,20 +3953,28 @@ dependencies = [ "dhat", "env_logger", "futures", + "hyper", "itertools 0.12.1", "log", "lsp-server", "lsp-types", "once_cell", + "open", "parking_lot", "paste", + "pin-project-lite", + "rayon", + "reflexo", "serde", "serde_json", + "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tokio", "tokio-util", - "toml 0.8.13", + "toml 0.8.14", + "tower-layer", + "tower-service", "typst", "typst-assets", "typst-pdf", @@ -3889,9 +3992,19 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tinymist-assets" +version = "0.11.12" + +[[package]] +name = "tinymist-assets" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5" + [[package]] name = "tinymist-query" -version = "0.11.11" +version = "0.11.12" dependencies = [ "anyhow", "biblatex", @@ -3916,16 +4029,18 @@ dependencies = [ "regex", "rust_iso3166", "rust_iso639", + "rustc-hash", "serde", "serde_json", "serde_yaml", "sha2", "siphasher 1.0.1", - "strum 0.26.2", - "toml 0.8.13", + "strum 0.26.3", + "toml 0.8.14", "triomphe", "ttf-parser", "typst", + "typst-assets", "typst-ts-compiler", "typst-ts-core", "unscanny", @@ -3935,7 +4050,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.11" +version = "0.11.12" dependencies = [ "base64 0.22.1", "log", @@ -3946,9 +4061,9 @@ 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", "serde", @@ -3957,9 +4072,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3972,9 +4087,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", @@ -3991,13 +4106,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.64", + "syn 2.0.68", ] [[package]] @@ -4040,6 +4155,7 @@ checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -4059,14 +4175,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -4093,17 +4209,23 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] +[[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" @@ -4129,7 +4251,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -4143,9 +4265,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" [[package]] name = "try-lock" @@ -4207,7 +4329,7 @@ version = "0.11.1" source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" dependencies = [ "az", - "bitflags 2.5.0", + "bitflags 2.6.0", "chinese-number", "ciborium", "comemo 0.4.0", @@ -4246,7 +4368,7 @@ dependencies = [ "stacker", "syntect", "time", - "toml 0.8.13", + "toml 0.8.14", "ttf-parser", "two-face", "typed-arena", @@ -4276,7 +4398,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] @@ -4306,29 +4428,19 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193407d42cff6e7fa4b5e0b634b9ead7ccc5393cfb708ed2bd60d930d9f1d9de" +version = "0.11.12" dependencies = [ - "anyhow", "await-tree", "clap", - "clap_complete", - "clap_mangen", "comemo 0.4.0", - "elsa", "env_logger", "futures", - "hyper", "indexmap 2.2.6", "log", - "memmap2", - "notify", "once_cell", - "open", "serde", "serde_json", - "tiny-skia", + "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "tokio-tungstenite", "typst", @@ -4336,7 +4448,6 @@ dependencies = [ "typst-ts-compiler", "typst-ts-core", "typst-ts-svg-exporter", - "vergen", ] [[package]] @@ -4421,47 +4532,41 @@ dependencies = [ [[package]] name = "typst-ts-compiler" -version = "0.5.0-rc4" +version = "0.5.0-rc5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d68fc30324347a294155cc4691defa4e01aaff23d7e3c1c40a3c8e5d22e3f" +checksum = "bd3f3a4d7b1c28314b2d664e321e8d5252fc5ad09091930b951557e386e20fcd" dependencies = [ - "append-only-vec", "base64 0.22.1", - "chrono", "codespan-reporting", "comemo 0.4.0", - "dirs", "flate2", - "fontdb", "fst", - "hex", "indexmap 2.2.6", - "instant", "log", "nohash-hasher", "notify", "once_cell", "parking_lot", "pathdiff", - "reqwest", + "rayon", + "reflexo", + "reflexo-vfs", + "reflexo-world", "rustc-hash", "serde", "serde_json", - "sha2", - "strum 0.25.0", "tar", "tokio", "typst", "typst-ts-core", "typst-ts-svg-exporter", - "walkdir", ] [[package]] name = "typst-ts-core" -version = "0.5.0-rc4" +version = "0.5.0-rc5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9355a7f3b2f687088524fa1d5c0d0cbe45878e9672d7a321aec491ae10b1dd" +checksum = "81026f9d356bb4d15d612a2e76274fc64379a98c356c2115c45add6565153262" dependencies = [ "base64 0.22.1", "base64-serde", @@ -4488,6 +4593,7 @@ dependencies = [ "serde_with", "sha2", "siphasher 1.0.1", + "svgtypes", "tiny-skia", "tiny-skia-path", "ttf-parser", @@ -4497,9 +4603,9 @@ dependencies = [ [[package]] name = "typst-ts-svg-exporter" -version = "0.5.0-rc4" +version = "0.5.0-rc5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b1e7baba2453d072cbc1e97a43d5a8ecfe36299fc103e9156bb9470abd35e0" +checksum = "6425d6586ba1bdf3d1da75aea61717dca9774f0a3ab969e799b067010522f318" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -4530,9 +4636,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.26" +version = "0.11.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08c00b01698330e3c46dd9454c3472e4107866de14fc52aeb1a55aa260bfc7b" +checksum = "f6cfef0bd8b71907de640287bef88b33e4e55b6a6ff5227bb8f36ae308a0e2da" dependencies = [ "anyhow", "clap", @@ -4638,9 +4744,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unsafe-libyaml" @@ -4662,9 +4768,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", @@ -4746,15 +4852,15 @@ 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 = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" [[package]] name = "vcpkg" @@ -4784,6 +4890,16 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "waitpid-any" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0189157c93c54d86e5c61ddf0c1223baa25e5bfb2f6f9983c678985b028d7c12" +dependencies = [ + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -4839,7 +4955,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -4873,7 +4989,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5142,9 +5258,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -5161,9 +5277,9 @@ dependencies = [ [[package]] name = "writeable" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wyz" @@ -5214,9 +5330,9 @@ dependencies = [ [[package]] name = "yaml-rust2" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f4d102a79ea1c9d4dd27573c0fc96ad74c023e8da38484e47883076da25fb" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ "arraydeque", "encoding_rs", @@ -5225,9 +5341,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -5237,13 +5353,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", "synstructure", ] @@ -5264,35 +5380,35 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] [[package]] name = "zerofrom" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", "synstructure", ] [[package]] name = "zerotrie" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" dependencies = [ "displaydoc", "litemap", @@ -5302,9 +5418,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ "serde", "yoke", @@ -5314,11 +5430,11 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.68", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix index 7d1397d91e..2e001701e7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix @@ -7,19 +7,22 @@ , zlib , stdenv , darwin +, nix-update-script +, testers +, tinymist }: rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.11"; + version = "0.11.12"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-uXrV3tvv9fXoEdFH+ajHECfNy4uTvUZBkhkfzGzj3HE="; + hash = "sha256-hqTVfEKaAG18JpUZajm0XaoX6kw26aE37T/kfoNNxk8="; }; cargoLock = { @@ -50,6 +53,14 @@ rustPlatform.buildRustPackage rec { "--skip=e2e" ]; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "${meta.mainProgram} -V"; + package = tinymist; + }; + }; + meta = { changelog = "https://github.com/Myriad-Dreamin/tinymist/blob/${src.rev}/CHANGELOG.md"; description = "Tinymist is an integrated language service for Typst"; diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix index 1f3410a9e1..10e0aca8a0 100644 --- a/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tp/tpnote/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.24.2"; + version = "1.24.4"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; rev = "v${version}"; - hash = "sha256-uNW1gb4zmLjOZFtxaBBEQGRGc9C2M8cSARZBa3+FC2k="; + hash = "sha256-otV00Lq3xen2kf90EonTbI4SPUob9M+el+5VaHeDPCw="; }; - cargoHash = "sha256-pOiIQU/5z/g4NbdwoYaDdxTfTkxEdddVsmuH54pCOBM="; + cargoHash = "sha256-zkq1yho9K4WUyGbf8zsb5abP4jJPv1+RZi2kAlp9BCU="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix index 5de74f5dba..fe33c5ba69 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.52.40"; + version = "2.53.2"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-jH1UNxlvnmM3Uv0y6MSh0fWcK4QRyJY+LRGoBb3G72U="; + hash = "sha256-LquQDKgh1yZ0kUuLIDHM3b8Xe8mdh/ZjILGvnOMm+Os="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treefmt/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/tr/treefmt/package.nix rename to third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix index ab61349bcf..81ca1b6b6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.0-rc5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "numtide"; diff --git a/third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix b/third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix index 0b40b8e77a..dfa532e494 100644 --- a/third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "txr"; - version = "294"; + version = "295"; src = fetchurl { url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-QdkN4FwobGRPQNQGcHC62Wi5hwQqsgyLo9etYYEfqDc="; + hash = "sha256-0HLrbO4v4gfk95w5SIXeQ/oNQMCMKBDkhtVJiVQtCYU="; }; buildInputs = [ libffi ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix index 247d6180b0..9d776e1632 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.27"; + version = "0.11.28"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-7c2WbAEDdCmh92MXBks0AjYEEKfVFVIgU+U2x5K2jLQ="; + hash = "sha256-U3A3ye45o8q+Kvv2lJqJ72Vn/Q9iPgUkwpA79DAHU2k="; }; - cargoHash = "sha256-EkMa5mudKaiGtMN2jhQ0PWZlpkpnYZUPXLAJng9+Kes="; + cargoHash = "sha256-A13nVLvjhoAPGIXfQX6AE+zMuvT7QT7BWJVS6ASnw10="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix index 2f41aa57ec..4944fbb654 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.11.16"; + version = "4.11.17"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-hvWXqPT+GeMaBa7so0S1KjsH5fpnbcbEIWsq6KUbFTk="; + hash = "sha256-qKLRn9QmB8lZv8vGGX8JS72IRLEDJV5Zj1MVsPr+iSI="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock index 174a1d9d68..18313bd9b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock @@ -224,7 +224,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -391,6 +391,7 @@ name = "bench" version = "0.0.0" dependencies = [ "anyhow", + "chrono", "codspeed-criterion-compat", "criterion", "distribution-filename", @@ -579,9 +580,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" +checksum = "7b0ade8eec3675f2a0962c3b4c1e1d40f83a8005ed536091d98ed2440bba5254" dependencies = [ "anyhow", "core-foundation", @@ -754,7 +755,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1393,7 +1394,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1812,6 +1813,8 @@ dependencies = [ name = "install-wheel-rs" version = "0.0.1" dependencies = [ + "anyhow", + "assert_fs", "clap", "configparser", "csv", @@ -1828,7 +1831,7 @@ dependencies = [ "pypi-types", "reflink-copy", "regex", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -1982,9 +1985,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libmimalloc-sys" -version = "0.1.38" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2138,14 +2141,14 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "mimalloc" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2488,7 +2491,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2535,7 +2538,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2571,7 +2574,7 @@ name = "platform-tags" version = "0.0.1" dependencies = [ "insta", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "thiserror", ] @@ -2693,12 +2696,12 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=a68cbd1a26e43986a31563e1d127e83bafca3a0c#a68cbd1a26e43986a31563e1d127e83bafca3a0c" +source = "git+https://github.com/astral-sh/pubgrub?rev=b4435e2f3af10dab2336a0345b35dcd622699d06#b4435e2f3af10dab2336a0345b35dcd622699d06" dependencies = [ "indexmap", "log", "priority-queue", - "rustc-hash", + "rustc-hash 1.1.0", "thiserror", ] @@ -2712,7 +2715,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.11.2", + "parking_lot 0.12.3", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2760,7 +2763,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2773,7 +2776,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2809,7 +2812,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "thiserror", "tokio", @@ -2825,7 +2828,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "slab", "thiserror", @@ -3302,6 +3305,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 = "rustix" version = "0.38.34" @@ -3431,7 +3440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3492,7 +3501,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3503,7 +3512,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3734,9 +3743,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3832,7 +3841,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3843,7 +3852,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "test-case-core", ] @@ -3865,7 +3874,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3905,7 +3914,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4021,7 +4030,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4157,7 +4166,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4180,7 +4189,7 @@ dependencies = [ "fs-err", "itertools 0.12.1", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "svg", @@ -4349,9 +4358,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", @@ -4418,7 +4427,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.13" +version = "0.2.15" dependencies = [ "anstream", "anyhow", @@ -4429,7 +4438,6 @@ dependencies = [ "byteorder", "chrono", "clap", - "clap_complete_command", "distribution-types", "filetime", "flate2", @@ -4452,7 +4460,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "textwrap", @@ -4468,6 +4476,7 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", @@ -4524,7 +4533,7 @@ dependencies = [ "pep508_rs", "pypi-types", "regex", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "tempfile", @@ -4551,7 +4560,7 @@ dependencies = [ "nanoid", "pypi-types", "rmp-serde", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "tempfile", "tracing", @@ -4561,6 +4570,30 @@ dependencies = [ "walkdir", ] +[[package]] +name = "uv-cli" +version = "0.0.1" +dependencies = [ + "anstream", + "anyhow", + "clap", + "clap_complete_command", + "distribution-types", + "fs-err", + "insta", + "install-wheel-rs", + "serde", + "url", + "uv-cache", + "uv-configuration", + "uv-normalize", + "uv-resolver", + "uv-settings", + "uv-toolchain", + "uv-version", + "uv-warnings", +] + [[package]] name = "uv-client" version = "0.0.1" @@ -4621,7 +4654,7 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -4648,7 +4681,7 @@ dependencies = [ "pretty_assertions", "pypi-types", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -4683,7 +4716,7 @@ dependencies = [ "install-wheel-rs", "itertools 0.13.0", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "tracing", "uv-build", "uv-cache", @@ -4721,7 +4754,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "rmp-serde", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "tempfile", @@ -4755,7 +4788,7 @@ dependencies = [ "md-5", "pypi-types", "rayon", - "rustc-hash", + "rustc-hash 2.0.0", "sha2", "thiserror", "tokio", @@ -4820,7 +4853,7 @@ dependencies = [ "platform-tags", "pypi-types", "rayon", - "rustc-hash", + "rustc-hash 2.0.0", "same-file", "serde", "tempfile", @@ -4847,7 +4880,7 @@ name = "uv-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4876,7 +4909,7 @@ dependencies = [ "pep508_rs", "pypi-types", "requirements-txt", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "thiserror", "toml", @@ -4922,7 +4955,7 @@ dependencies = [ "pypi-types", "requirements-txt", "rkyv", - "rustc-hash", + "rustc-hash 2.0.0", "same-file", "schemars", "serde", @@ -4983,6 +5016,7 @@ dependencies = [ "anyhow", "assert_fs", "cache-key", + "clap", "configparser", "fs-err", "futures", @@ -5031,7 +5065,7 @@ dependencies = [ "pep440_rs", "pep508_rs", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "url", "uv-cache", @@ -5043,7 +5077,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.13" +version = "0.2.15" [[package]] name = "uv-virtualenv" @@ -5068,7 +5102,7 @@ dependencies = [ "anstream", "once_cell", "owo-colors", - "rustc-hash", + "rustc-hash 2.0.0", ] [[package]] @@ -5138,7 +5172,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -5172,7 +5206,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5336,7 +5370,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5347,7 +5381,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5358,7 +5392,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5369,7 +5403,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix index 5329a60df8..8590c1bee0 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -16,21 +16,21 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-/YRmaPNTw3RsaB4bTb5UO0qXtRe2h1oD4Bav6VQ4W04="; + hash = "sha256-dHw08huVslrePcZvIXhui87bPGp5+CChiN+DtY7bLVw="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "pubgrub-0.2.1" = "sha256-i1Eaip4J5VXb66p1w0sRjP655AngBLEym70ChbAFFIc="; + "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix index 4a4aa3f3a1..ed2df2e36f 100644 --- a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.05.24"; + version = "2024.06.15"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-R9iQIEmraXOzPi6rOd7wVV9BMC/wDDEveLIRJmAVISI="; + hash = "sha256-eDpMGDtC44eh0elLWV0r1H/WbpVdZ5qMedKh7Ct50Cs="; }; installPhase = let diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json index de09d96439..e0c4ad411a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.9.0", + "version": "1.9.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.9.0", + "version": "1.9.3", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -15,7 +15,7 @@ "eslint-plugin-simple-header": "^1.0.2", "fflate": "^0.7.4", "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3", - "monaco-editor": "^0.43.0", + "monaco-editor": "^0.50.0", "nanoid": "^4.0.2", "virtual-merge": "^1.0.1" }, @@ -618,9 +618,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz", - "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==", + "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" @@ -882,9 +882,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz", + "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==", "dev": true }, "node_modules/@types/minimist": { @@ -894,9 +894,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.38", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.38.tgz", - "integrity": "sha512-SApYXUF7si4JJ+lO2o6X60OPOnA6wPpbiB09GMCkQ+JAwpa9hxUVG8p7GzA08TKQn5OhzK57rj1wFj+185YsGg==", + "version": "18.19.39", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz", + "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -3507,9 +3507,9 @@ "dev": true }, "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==" + "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", @@ -3799,9 +3799,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.43.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.43.0.tgz", - "integrity": "sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==" + "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", @@ -5397,9 +5397,9 @@ } }, "node_modules/ts-patch": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ts-patch/-/ts-patch-3.2.0.tgz", - "integrity": "sha512-fUGMkjGIlD4BFibDM+6pLYLXRguzCUY6fhP1KQzSnFJfAtTDT7DKyX0yHn3CJqfBv4mia/o3ZRte31UVf9Dl1A==", + "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", diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix index edf4ec8203..9df3a62388 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.9.0"; - gitHash = "3505ada"; + version = "1.9.3"; + gitHash = "484d70f"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-H2LyZJPm5D6uUskJdpaESlO+/U9KWDrz8q+ZdgcyGr0="; + hash = "sha256-My9jIjGA9+ax7TBHIlXavoWNhsenFGqtZ/ePmdMv1qQ="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-hTOaAtAyIfnOwirqP2y/2MIOXLsUmO7CkyJvebO7C34="; + npmDepsHash = "sha256-+gcm570JtI8ErdTU+YFPLK4O0jKv7CWdkX7kBKbqfXI="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix index 2c60537b0c..585c989f4c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -16,6 +16,7 @@ pnpm, nodejs, withTTS ? true, + withMiddleClickScroll ? false, # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version withSystemVencord ? false, @@ -134,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { 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 '' diff --git a/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix b/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix index 542b5cbfc8..80a13d1810 100644 --- a/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -1,8 +1,12 @@ { lib +, stdenv , buildNpmPackage , fetchFromGitHub , buildPackages , libsecret +, xcbuild +, Security +, AppKit , pkg-config , nodePackages , runCommand @@ -23,9 +27,17 @@ buildNpmPackage rec { npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM="; - nativeBuildInputs = [ pkg-config nodePackages.node-gyp ]; + nativeBuildInputs = [ + pkg-config + nodePackages.node-gyp + ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - buildInputs = [ libsecret ]; + buildInputs = + lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.isDarwin [ + Security + AppKit + ]; postPatch = '' ${lib.getExe buildPackages.jq} ' diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package-lock.json b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package-lock.json new file mode 100644 index 0000000000..7be780852f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package-lock.json @@ -0,0 +1,855 @@ +{ + "name": "@vue/language-server", + "version": "2.0.21", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@vue/language-server", + "version": "2.0.21", + "license": "MIT", + "dependencies": { + "@volar/language-core": "~2.3.0-alpha.15", + "@volar/language-server": "~2.3.0-alpha.15", + "@vue/language-core": "2.0.21", + "@vue/language-service": "2.0.21", + "@vue/typescript-plugin": "2.0.21", + "vscode-languageserver-protocol": "^3.17.5", + "vscode-uri": "^3.0.8" + }, + "bin": { + "vue-language-server": "bin/vue-language-server.js" + } + }, + "node_modules/@babel/parser": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@emmetio/abbreviation": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", + "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/css-abbreviation": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", + "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/css-parser": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@emmetio/css-parser/-/css-parser-0.4.0.tgz", + "integrity": "sha512-z7wkxRSZgrQHXVzObGkXG+Vmj3uRlpM11oCZ9pbaz0nFejvCDmAiNDpY75+wgXOcffKpj4rzGtwGaZxfJKsJxw==", + "dependencies": { + "@emmetio/stream-reader": "^2.2.0", + "@emmetio/stream-reader-utils": "^0.1.0" + } + }, + "node_modules/@emmetio/html-matcher": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz", + "integrity": "sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==", + "dependencies": { + "@emmetio/scanner": "^1.0.0" + } + }, + "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==" + }, + "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==" + }, + "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==" + }, + "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==" + }, + "node_modules/@volar/language-core": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.3.0.tgz", + "integrity": "sha512-pvhL24WUh3VDnv7Yw5N1sjhPtdx7q9g+Wl3tggmnkMcyK8GcCNElF2zHiKznryn0DiUGk+eez/p2qQhz+puuHw==", + "dependencies": { + "@volar/source-map": "2.3.0" + } + }, + "node_modules/@volar/language-server": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.3.0.tgz", + "integrity": "sha512-KXujrZoBd4lhdL+N+4bwsPbDZy8/zFyZSiyqLr6uIbSxJC/njRznQx5u5y5Txw5hbNuQCCR9B8EPv2jjKUbyeA==", + "dependencies": { + "@volar/language-core": "2.3.0", + "@volar/language-service": "2.3.0", + "@volar/snapshot-document": "2.3.0", + "@volar/typescript": "2.3.0", + "path-browserify": "^1.0.1", + "request-light": "^0.7.0", + "vscode-languageserver": "^9.0.1", + "vscode-languageserver-protocol": "^3.17.5", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@volar/language-service": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.3.0.tgz", + "integrity": "sha512-U0ggeoHh4afYflGD2vjw8QPwnnDg5V4QDkZ5meL+B2YwrXEF9bVAHTjYaR8AxJ2qb3mwOwXLtZ9psJJSjkdctw==", + "dependencies": { + "@volar/language-core": "2.3.0", + "vscode-languageserver-protocol": "^3.17.5", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@volar/snapshot-document": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.3.0.tgz", + "integrity": "sha512-0dBMaxElxYOX9eSRjpIM5+cV0aqrypArJwjCzc/gQ3E1H+MEAi3YpAzUyLxG8aSidUm8msUWZc4X+gP/rSIeng==", + "dependencies": { + "vscode-languageserver-protocol": "^3.17.5", + "vscode-languageserver-textdocument": "^1.0.11" + } + }, + "node_modules/@volar/source-map": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.3.0.tgz", + "integrity": "sha512-G/228aZjAOGhDjhlyZ++nDbKrS9uk+5DMaEstjvzglaAw7nqtDyhnQAsYzUg6BMP9BtwZ59RIw5HGePrutn00Q==", + "dependencies": { + "muggle-string": "^0.4.0" + } + }, + "node_modules/@volar/typescript": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.3.0.tgz", + "integrity": "sha512-PtUwMM87WsKVeLJN33GSTUjBexlKfKgouWlOUIv7pjrOnTwhXHZNSmpc312xgXdTjQPpToK6KXSIcKu9sBQ5LQ==", + "dependencies": { + "@volar/language-core": "2.3.0", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@vscode/emmet-helper": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz", + "integrity": "sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==", + "dependencies": { + "emmet": "^2.4.3", + "jsonc-parser": "^2.3.0", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "^3.15.1", + "vscode-uri": "^2.1.2" + } + }, + "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==" + }, + "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==" + }, + "node_modules/@vue/compiler-core": { + "version": "3.4.29", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz", + "integrity": "sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==", + "dependencies": { + "@babel/parser": "^7.24.7", + "@vue/shared": "3.4.29", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.0" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.4.29", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz", + "integrity": "sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==", + "dependencies": { + "@vue/compiler-core": "3.4.29", + "@vue/shared": "3.4.29" + } + }, + "node_modules/@vue/language-core": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.21.tgz", + "integrity": "sha512-vjs6KwnCK++kIXT+eI63BGpJHfHNVJcUCr3RnvJsccT3vbJnZV5IhHR2puEkoOkIbDdp0Gqi1wEnv3hEd3WsxQ==", + "dependencies": { + "@volar/language-core": "~2.3.0-alpha.15", + "@vue/compiler-dom": "^3.4.0", + "@vue/shared": "^3.4.0", + "computeds": "^0.0.1", + "minimatch": "^9.0.3", + "path-browserify": "^1.0.1", + "vue-template-compiler": "^2.7.14" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/language-service": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.21.tgz", + "integrity": "sha512-AyhoOubcGWC0aA/Ae+VUFszeJ9m+6uWrbYlyjNyHF4RM8aj+ymOjzyPVE4WbER3g9sTNu/zm/zu+Sl5avIDZbg==", + "dependencies": { + "@volar/language-core": "~2.3.0-alpha.15", + "@volar/language-service": "~2.3.0-alpha.15", + "@volar/typescript": "~2.3.0-alpha.15", + "@vue/compiler-dom": "^3.4.0", + "@vue/language-core": "2.0.21", + "@vue/shared": "^3.4.0", + "@vue/typescript-plugin": "2.0.21", + "computeds": "^0.0.1", + "path-browserify": "^1.0.1", + "volar-service-css": "0.0.50", + "volar-service-emmet": "0.0.50", + "volar-service-html": "0.0.50", + "volar-service-json": "0.0.50", + "volar-service-pug": "0.0.50", + "volar-service-pug-beautify": "0.0.50", + "volar-service-typescript": "0.0.50", + "volar-service-typescript-twoslash-queries": "0.0.50", + "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@vue/shared": { + "version": "3.4.29", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz", + "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==" + }, + "node_modules/@vue/typescript-plugin": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.21.tgz", + "integrity": "sha512-RNiM0VgETuP/kEhMYfikDoqXvqwO6LZtL8zMLWeciNQFKGq7DCBk8chOO5dpnOXl6hrENCqk3keIvp3jPdLSCQ==", + "dependencies": { + "@volar/typescript": "~2.3.0-alpha.15", + "@vue/language-core": "2.0.21", + "@vue/shared": "^3.4.0" + } + }, + "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/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": "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/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "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/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==", + "dependencies": { + "is-regex": "^1.0.3" + } + }, + "node_modules/computeds": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz", + "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==" + }, + "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==" + }, + "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==", + "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/emmet": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", + "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "dependencies": { + "@emmetio/abbreviation": "^2.3.3", + "@emmetio/css-abbreviation": "^2.1.8" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=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==", + "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==", + "engines": { + "node": ">= 0.4" + } + }, + "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==" + }, + "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/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "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/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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==", + "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==", + "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==", + "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==", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "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==", + "bin": { + "he": "bin/he" + } + }, + "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==", + "dependencies": { + "acorn": "^7.1.1", + "object-assign": "^4.1.1" + } + }, + "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==", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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==" + }, + "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/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==" + }, + "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/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + }, + "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==" + }, + "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==", + "dependencies": { + "character-parser": "^2.2.0", + "is-expression": "^4.0.0", + "pug-error": "^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==", + "dependencies": { + "pug-error": "^2.0.0", + "token-stream": "1.0.0" + } + }, + "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==" + }, + "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/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==", + "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/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/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==" + }, + "node_modules/typescript-auto-import-cache": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", + "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "dependencies": { + "semver": "^7.3.8" + } + }, + "node_modules/volar-service-css": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.50.tgz", + "integrity": "sha512-x2KkGRBY4IRarIFrBrR5CcynNSPv8oviYgekQvKVBtJdll00jOkstnArNa6h0x0k06bJ1WFB/i9Nd3L+WgtcMg==", + "dependencies": { + "vscode-css-languageservice": "^6.2.10", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-emmet": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.50.tgz", + "integrity": "sha512-W70iT0lkiyERXTTQMgQhRP0fqW0JO2Kn4JUWvWTLblRvYPKJ7MxWQKwVQN+ng3L9U6fZCkrd2P3FN00Tl8M4Qw==", + "dependencies": { + "@emmetio/css-parser": "^0.4.0", + "@emmetio/html-matcher": "^1.3.0", + "@vscode/emmet-helper": "^2.9.2", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-html": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.50.tgz", + "integrity": "sha512-pcyQo1Pzxp5O27CIt66KjussUnKDmlTmI23L8DABOr7U7uNHV5bqzcDE8dOTHP2Jf5d0+TKAaUSWY9g5BcziQQ==", + "dependencies": { + "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-json": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.50.tgz", + "integrity": "sha512-u/DSm8N9fMnIeD+FyXYKElqK3C2c2PGs7cW1evk9tRzT53cJmoDDtca3P1AdqKl4ZpomKEOA9MfXvQFashzpvw==", + "dependencies": { + "vscode-json-languageservice": "^5.3.7", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-pug": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.50.tgz", + "integrity": "sha512-z9TFeHnNDhJNyQCL7KinVMpmNaPDo86odG1nG4ysn8D0uMKD/E1m7Qe5sttaKPyx8nywhQKWBYZTPsVuoIB9fQ==", + "dependencies": { + "@volar/language-service": "~2.3.0-alpha.5", + "pug-lexer": "^5.0.1", + "pug-parser": "^6.0.0", + "volar-service-html": "0.0.50", + "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-languageserver-textdocument": "^1.0.11" + } + }, + "node_modules/volar-service-pug-beautify": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.50.tgz", + "integrity": "sha512-xzTBsjglVpNWyH8auUznE9EDL57RavwoldjRlxkgV2vppQXvRl8S5dXihGxkcW+/lrV6xaDCckuf7kcmd0osqA==", + "dependencies": { + "@johnsoncodehk/pug-beautify": "^0.2.2" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-typescript": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.50.tgz", + "integrity": "sha512-2QNEtBtZ0dA1WfITavj+7fFCzVCqkpgTgDI8uxMHkWuqMfkETPlYz04603TG1/KOQ1dO2THW8zj4OXDJFmdYXQ==", + "dependencies": { + "path-browserify": "^1.0.1", + "semver": "^7.5.4", + "typescript-auto-import-cache": "^0.3.1", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-nls": "^5.2.0", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/volar-service-typescript-twoslash-queries": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.50.tgz", + "integrity": "sha512-8fYdKlONEl4rU51Wf6qYM4rTFOHvVIhZ1oa9ZmI/tDQIYvK+JSwvov2IPfTVfHmqTet/aS4njmKa0D25CgKuGA==", + "dependencies": { + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "@volar/language-service": "~2.3.0-alpha.5" + }, + "peerDependenciesMeta": { + "@volar/language-service": { + "optional": true + } + } + }, + "node_modules/vscode-css-languageservice": { + "version": "6.2.14", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz", + "integrity": "sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-html-languageservice": { + "name": "@johnsoncodehk/vscode-html-languageservice", + "version": "5.2.0-34a5462", + "resolved": "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz", + "integrity": "sha512-etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA==", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-json-languageservice": { + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.11.tgz", + "integrity": "sha512-WYS72Ymria3dn8ZbjtBbt5K71m05wY1Q6hpXV5JxUT0q75Ts0ljLmnZJAVpx8DjPgYbFD+Z8KHpWh2laKLUCtQ==", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "jsonc-parser": "^3.2.1", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-json-languageservice/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/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "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==", + "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==", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz", + "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==" + }, + "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-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==" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==" + }, + "node_modules/vue-template-compiler": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", + "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==", + "dependencies": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package.nix new file mode 100644 index 0000000000..d18ac720c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchurl, +}: + +buildNpmPackage rec { + pname = "vue-language-server"; + version = "2.0.21"; + + src = fetchurl { + url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; + hash = "sha256-FTsLvSZr+03o8h/udMfcUGBK41/xkrNeMUuOliataH8="; + }; + + npmDepsHash = "sha256-wYrLN42If6gAjRok0tAdVvVoDmv5oK/vvPoT3BxtgdA="; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Official Vue.js language server"; + homepage = "https://github.com/vuejs/language-tools#readme"; + changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ friedow ]; + mainProgram = "vue-language-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/update.sh b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/update.sh new file mode 100755 index 0000000000..36321e8a30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vu/vue-language-server/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget + +set -euo pipefail +pushd "$(dirname "${BASH_SOURCE[0]}")" + +version=$(npm view @vue/language-server version) +tarball="language-server-$version.tgz" +url="https://registry.npmjs.org/@vue/language-server/-/$tarball" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix + +sha256=$(nix-prefetch-url "$url") +src_hash=$(nix-hash --to-sri --type sha256 "$sha256") +sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix + +rm -f package-lock.json package.json *.tgz +wget "$url" +tar xf "$tarball" --strip-components=1 package/package.json +npm i --package-lock-only --ignore-scripts +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +rm -f package.json *.tgz + +popd diff --git a/third_party/nixpkgs/pkgs/by-name/wa/walker/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/walker/package.nix index 8404948b03..cb59b475f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/walker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/walker/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "walker"; - version = "0.0.71"; + version = "0.0.72"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-ShLwQBWhaoeHijiQCMO3n0DnhNaEd8GOrYMcli5EIZs="; + hash = "sha256-F100XVtWtY+yxGrMVCrkR/ayM2/aoko1ec0FFgNMhww="; }; vendorHash = "sha256-zDntJ695k8dbwyFXbg9PapWD335MHrWbep1xxzXNIL4="; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json index 825439bdbb..18904753ae 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-qlABqTy4tQp++k7MFXOjZV562m4rnlDqYLDL2sd0/QE=", - "version": "0.2024.06.18.08.02.stable_03" + "hash": "sha256-vogQAVbtiw2/U3oJrTj8SUexkEsEfYvmGq50nzy5aYo=", + "version": "0.2024.06.25.08.02.stable_01" }, "linux": { - "hash": "sha256-8/9VgkKU7VO7m0Mgx24vM2Bv6+yqcSlhPLZ1slCTCEc=", - "version": "0.2024.06.18.08.02.stable_04" + "hash": "sha256-Fc48bZzFBw9p636Mr8R+W/d1B3kIcOAu/Gd17nbzNfI=", + "version": "0.2024.06.25.08.02.stable_01" } } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix index e563137c1d..693459de04 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wayidle"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "wayidle"; rev = "v${version}"; - hash = "sha256-6wULrwGnXLdrX/THanJThbykKjNKpGukw9dj0jX0/dM="; + hash = "sha256-7hFk/YGOQ5+gQy6pT5DRgMLThQ1vFAvUvdHekTyzIRU="; }; - cargoHash = "sha256-zF2s3XSXnN7jVtv/0axzHiIJd/cb6wMYAOQILXp1U5U="; + cargoHash = "sha256-PohfLmUoK+2a7Glnje4Rbym2rvzydUJAYW+edOj7qeo="; meta = with lib; { description = "Execute a program when a Wayland compositor reports being N seconds idle"; diff --git a/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix b/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix index f68f070465..0c147beaa7 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix @@ -55,7 +55,7 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ - --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/lib/node_modules/webcord/ runHook postInstall diff --git a/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix b/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix index 0e9e45603f..282dcc25d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.6.1"; + version = "2.6.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-10RyCVF1w5xj/qhFXQTlyrt9HG/4di2fUwUtDHU6t44="; + hash = "sha256-dm4rzAP/sp6j8aCsZJbf7TBx7pmjetP2374IAury+kg="; }; - vendorHash = "sha256-d1Dn+JN8tiBVx7YDbtvLW0YgIW2ENrEdx4gKatYy1hw="; + vendorHash = "sha256-3p8zoZyH042jmhOD6WGGcHnHhLqm7gMnlaiRZu1OWmE="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/by-name/wg/wg-access-server/package.nix b/third_party/nixpkgs/pkgs/by-name/wg/wg-access-server/package.nix new file mode 100644 index 0000000000..e10210f31d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wg/wg-access-server/package.nix @@ -0,0 +1,71 @@ +{ lib +, buildGoModule +, buildNpmPackage +, fetchFromGitHub +, makeWrapper +, iptables +, nixosTests +}: + +buildGoModule rec { + pname = "wg-access-server"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "freifunkMUC"; + repo = "wg-access-server"; + rev = "v${version}"; + hash = "sha256-AhFqEmHrx9MCdjnB/YA3qU7KsaMyLO+vo53VWUrcL8I="; + }; + + proxyVendor = true; # darwin/linux hash mismatch + vendorHash = "sha256-YwFq0KxUctU3ElZBo/b68pyp4lJnFGL9ClKIwUzdngM="; + + CGO_ENABLED = 1; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ makeWrapper ]; + + checkFlags = [ "-skip=TestDNSProxy_ServeDNS" ]; + + ui = buildNpmPackage { + inherit version src; + pname = "wg-access-server-ui"; + + npmDepsHash = "sha256-04AkSDSKsr20Jbx5BJy36f8kWNlzzplu/xnoDTkU8OQ="; + + sourceRoot = "${src.name}/website"; + + installPhase = '' + mv build $out + ''; + }; + + postPatch = '' + substituteInPlace internal/services/website_router.go \ + --replace-fail 'website/build' "${ui}" + ''; + + preBuild = '' + VERSION=v${version} go generate buildinfo/buildinfo.go + ''; + + postInstall = '' + mkdir -p $out/ + wrapProgram $out/bin/wg-access-server \ + --prefix PATH : ${lib.makeBinPath [ iptables ]} + ''; + + passthru = { + tests = { inherit (nixosTests) wg-access-server; }; + }; + + meta = with lib; { + description = "An all-in-one WireGuard VPN solution with a web ui for connecting devices"; + homepage = "https://github.com/freifunkMUC/wg-access-server"; + license = licenses.mit; + maintainers = with maintainers; [ xanderio ]; + mainProgram = "wg-access-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix index 041442cff9..72a3953c66 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.73"; + version = "2.9.76"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-KDw6axnjwMnXeTKaG2GIF2C4dKiZ/MW2q0SlZGlBIoI="; + hash = "sha256-cE9I975QOuXusuRCVyhXcHJ1ItgqPKAylNMeVTSUl9Y="; }; - npmDepsHash = "sha256-U7gZNKUIU3wS8DaVdxi1/Ik+dzwPfyoI3m//2MgPvt4="; + npmDepsHash = "sha256-qqzmLr01rg6f1VpJlPrZ38BobVeAiEkiDk2jiXCpsX4="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wideriver/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wideriver/package.nix new file mode 100644 index 0000000000..7608260856 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/wideriver/package.nix @@ -0,0 +1,40 @@ +{ + stdenv, + fetchFromGitHub, + lib, + wayland, + wayland-scanner, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wideriver"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "alex-courtis"; + repo = "wideriver"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-D1JHfMnq6u057FrBqgZ4UlfeOlkTWKkKzFYM29+vIJo="; + }; + + nativeBuildInputs = [ + pkg-config + wayland-scanner + ]; + + buildInputs = [ + wayland + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Tiling window manager for the river wayland compositor, inspired by dwm and xmonad"; + homepage = "https://github.com/alex-courtis/wideriver"; + license = lib.licenses.gpl3Only; + mainProgram = "wideriver"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ clebs ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix index 2c6e389cc8..cf794ea444 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-tLOiGl5/HuDbhrRyu+xZ6lL408n85MXl63lecGgok9w="; + hash = "sha256-8nP+Qv+QZjyG0VcaBd22UIiEYsfPq/D13c+KT2700Vk="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix index a0672ab00b..f3bdc3b38f 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-A73ONUSW5pDoDB7+U3kOcLWnYxco9brhhL1cRLh2wug="; + hash = "sha256-df2MBn5Ob9lQleiaKJnxFotI0AmdGJs/ifS9WCObXUo="; }; - cargoHash = "sha256-L15XhJ1h9jmIBmtIob5X3EXkVDCqaBCrtI9sojtRUTQ="; + cargoHash = "sha256-y1jyDRPoaeoZYPTqonYwMOtOkQ/S54mbbTU2jBX6Teg="; # 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/third_party/nixpkgs/pkgs/by-name/wl/wlinhibit/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlinhibit/package.nix index b134786a5f..5aa0de3454 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlinhibit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlinhibit/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { hash = "sha256-YQHJ9sLHSV8GJP7IpRzmtDbeB86y/a48mLcYy4iDciw="; }; - buildInputs = [ wayland wayland-protocols @@ -38,5 +37,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; homepage = "https://github.com/0x5a4/wlinhibit"; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [_0x5a4]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix index 3f7f3cae30..2cf571540f 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -5,24 +5,16 @@ python3.pkgs.buildPythonApplication rec { pname = "wlr-layout-ui"; - version = "1.6.11"; + version = "1.6.14"; pyproject = true; src = fetchFromGitHub { owner = "fdev31"; repo = "wlr-layout-ui"; rev = "refs/tags/${version}"; - hash = "sha256-aM8KV3jzim14lBVvn/AqUsfoRWrnKtRJeFSX1Thrq3M="; + hash = "sha256-Qgg4fdxOVkADDOxmQgQFSF/wgrEQihoRNC9oXeQvaoI="; }; - postPatch = '' - # The hyprland default.nix patches the version.h of hyprland so that the - # version info moves to the commit key. - substituteInPlace src/wlr_layout_ui/screens.py \ - --replace 'json.loads(subprocess.getoutput("hyprctl -j version"))["tag"]'\ - 'json.loads(subprocess.getoutput("hyprctl -j version"))["commit"]' - ''; - nativeBuildInputs = [ python3.pkgs.poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock index e819514493..823bb7ba80 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock @@ -78,9 +78,9 @@ 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", @@ -90,9 +90,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -160,9 +160,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", ] @@ -225,11 +225,11 @@ 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 0.8.3", ] [[package]] @@ -372,9 +372,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ "async-io", "async-lock", @@ -539,9 +539,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -603,22 +603,12 @@ 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", ] @@ -701,9 +691,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -747,6 +737,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" @@ -796,9 +792,9 @@ 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", @@ -806,9 +802,9 @@ dependencies = [ [[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", @@ -818,9 +814,9 @@ 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", @@ -830,9 +826,9 @@ 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 = "cmake" @@ -1022,7 +1018,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", "wasm-bindgen", @@ -1118,9 +1114,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "cxx" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb497fad022245b29c2a0351df572e2d67c1046bcef2260ebc022aec81efea82" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1130,9 +1126,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.122" +version = "0.7.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a476ac5d29b1957ad93669eef9a030e9fc139103f9bb1ff9f15504c3f21236b0" +checksum = "749d9ac61b735e0d15b041225ad97a6f74b4bdf9f9dc98469553ca6109f57a56" dependencies = [ "codespan-reporting", "proc-macro2", @@ -1142,15 +1138,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c799a4a846f1c0acb9f36bb9c6272d9b3d9457f3633c7753c6057270df13c" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bc249a7e3cd554fd2e8e08a426e9670c50bbfc9a621653cfa9accc9641783" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", @@ -1221,15 +1217,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 0.4.0", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1248,6 +1244,17 @@ 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.66", +] + [[package]] name = "dlib" version = "0.5.2" @@ -1272,6 +1279,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-fourcc" version = "2.2.0" @@ -1292,9 +1305,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", @@ -1302,9 +1315,9 @@ 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", @@ -1396,9 +1409,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flexi_logger" -version = "0.28.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419c99d8fc346ea0eaeaac2cc3945024d8fe82aa435aefc2fb9fcda1065f8774" +checksum = "be7e34f5ab91a424df2053c5c047e2e25bd4ff9f87a7402ee6892d4e02afe492" dependencies = [ "chrono", "glob", @@ -1696,6 +1709,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" @@ -1747,14 +1766,121 @@ dependencies = [ ] [[package]] -name = "icrate" -version = "0.0.4" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "block2", - "dispatch", - "objc2", + "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]] @@ -1786,12 +1912,14 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -2069,6 +2197,12 @@ 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" @@ -2115,9 +2249,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" @@ -2211,7 +2345,21 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "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", + "jni-sys", + "log", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -2232,6 +2380,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 = "nix" version = "0.26.4" @@ -2265,7 +2422,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -2364,25 +2521,206 @@ 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", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "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", + "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.5.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 = "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", + "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", + "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", + "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", + "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", + "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.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "object" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -2394,7 +2732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ "jni 0.21.1", - "ndk", + "ndk 0.8.0", "ndk-context", "num-derive", "num-traits", @@ -2526,7 +2864,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -2641,6 +2979,26 @@ 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.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2700,13 +3058,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "3.7.1" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -2865,15 +3223,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" @@ -2885,18 +3234,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] [[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", @@ -2906,9 +3255,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", @@ -2917,18 +3266,19 @@ 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 = "rodio" -version = "0.17.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3" dependencies = [ "cpal", "hound", + "thiserror", ] [[package]] @@ -3050,9 +3400,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" dependencies = [ "ab_glyph", "log", @@ -3215,6 +3565,12 @@ 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" @@ -3264,6 +3620,12 @@ dependencies = [ "serde", ] +[[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" @@ -3288,7 +3650,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.3", + "strum_macros 0.26.4", ] [[package]] @@ -3306,9 +3668,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3339,6 +3701,17 @@ dependencies = [ "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 2.0.66", +] + [[package]] name = "sysinfo" version = "0.30.12" @@ -3459,20 +3832,15 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" version = "0.8.2" @@ -3578,27 +3946,12 @@ dependencies = [ "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" @@ -3607,9 +3960,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unsafe-libyaml" @@ -3619,9 +3972,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[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", @@ -3630,10 +3983,22 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "version-compare" @@ -3659,7 +4024,7 @@ dependencies = [ [[package]] name = "vulkano" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "ash", @@ -3670,15 +4035,16 @@ dependencies = [ "heck 0.4.1", "indexmap 2.2.6", "libloading 0.8.3", + "nom", "objc", "once_cell", "parking_lot", "proc-macro2", "quote", "raw-window-handle", - "regex", "serde", "serde_json", + "slabbin", "smallvec", "thread_local", "vk-parse", @@ -3688,7 +4054,7 @@ dependencies = [ [[package]] name = "vulkano-macros" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", @@ -3699,7 +4065,7 @@ dependencies = [ [[package]] name = "vulkano-shaders" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "heck 0.4.1", @@ -3913,9 +4279,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4005,9 +4371,9 @@ dependencies = [ [[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", ] @@ -4219,37 +4585,41 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "1dc930d6cfbf53c4fe0b95689cdc2e17b8658c3f4214b9953298ccb5a1a15c90" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.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 0.9.4", - "ndk", - "ndk-sys", + "ndk 0.9.0", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -4259,7 +4629,7 @@ dependencies = [ "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4343,6 +4713,18 @@ dependencies = [ "xkbcommon", ] +[[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 = "x11-dl" version = "2.21.0" @@ -4401,12 +4783,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4436,9 +4818,9 @@ 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" dependencies = [ "bytemuck", ] @@ -4485,6 +4867,30 @@ dependencies = [ "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 2.0.66", + "synstructure", +] + [[package]] name = "zbus" version = "4.0.1" @@ -4569,6 +4975,49 @@ dependencies = [ "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 = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[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 = "zvariant" version = "4.0.0" diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix index 6f614edc6c..5667cecdca 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -22,20 +22,20 @@ rustPlatform.buildRustPackage rec { pname = "wlx-overlay-s"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "galister"; repo = "wlx-overlay-s"; rev = "v${version}"; - hash = "sha256-9ess8/H7cByNYFNHvCi0124xCBwXk+PTNhAZKBcS08A="; + hash = "sha256-4sW/WxoN5jAomA/aFAAH8z8CAB7zsevpBllSwaQWSmU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8="; "ovr_overlay-0.0.0" = "sha256-d38LqhKOp9tHbiK4eU7OPdFvkExqaJN1tB6y2qqPm9U="; + "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc="; "wlx-capture-0.3.11" = "sha256-CmFnVfA3MAYXSejn9GpuaNCRu4HiX0CN0j3aN4Pxvjw="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix b/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix index a9243ef3ad..0a5fbe1fe4 100644 --- a/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix @@ -3,19 +3,17 @@ let version = "2.12.0"; pname = "wowup-cf"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8="; }; - appimageContents = appimageTools.extractType1 { inherit name src; }; + appimageContents = appimageTools.extractType1 { inherit pname version src; }; in appimageTools.wrapType1 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix index cfcaa1dc8e..4beeef570e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix @@ -7,7 +7,7 @@ }: let - version = "9.7.0"; + version = "9.7.2"; in rustPlatform.buildRustPackage { @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-8bLccR6ZmldmrvjlZKFHEa4PoLzyUcLkyQbwSrJjoyY="; + hash = "sha256-5hpkY8MoSo59KmhXsPuLCmWq4KaUzuHBpesQMtgn7hw="; }; - cargoHash = "sha256-IAq7Fyr6Ne1Bq18WfqBoppel9FOWSs8PkiXKMwcJ26c="; + cargoHash = "sha256-kv+DX98SjI3m2CdM4RHoMMISZyrFmlhlSaBor0dFUSE="; checkFlags = [ # Tries to launch a test container diff --git a/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/deps.nix b/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/deps.nix index fa65ff3a7d..4f8e95ba38 100644 --- a/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/deps.nix @@ -10,6 +10,8 @@ (fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; }) (fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; }) (fetchNuGet { pname = "KeySharp"; version = "1.0.5"; sha256 = "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) @@ -20,6 +22,9 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) (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.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) diff --git a/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/package.nix index cea9a6e32e..064bce81d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xi/xivlauncher/package.nix @@ -3,7 +3,7 @@ , useSteamRun ? true }: let - rev = "1.0.8"; + rev = "1.0.9"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-x4W5L4k+u0MYKDWJu82QcXARW0zjmqqwGiueR1IevMk="; + hash = "sha256-UOKJMQPule0swwm5p6OPcOt1SYHji2J4MWvN6nGkj/M="; fetchSubmodules = true; }; @@ -24,6 +24,10 @@ in projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj"; nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps` + # please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnetFlags = [ "-p:BuildHash=${rev}" "-p:PublishSingleFile=false" @@ -31,7 +35,7 @@ in postPatch = '' substituteInPlace lib/FFXIVQuickLauncher/src/XIVLauncher.Common/Game/Patch/Acquisition/Aria/AriaHttpPatchAcquisition.cs \ - --replace 'ariaPath = "aria2c"' 'ariaPath = "${aria2}/bin/aria2c"' + --replace-fail 'ariaPath = "aria2c"' 'ariaPath = "${aria2}/bin/aria2c"' ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/xl/xld/package.nix b/third_party/nixpkgs/pkgs/by-name/xl/xld/package.nix new file mode 100644 index 0000000000..bd27f6511b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xl/xld/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +, writeShellApplication +, curl +, xmlstarlet +, common-updater-scripts +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "xld"; + version = "20240511"; + + src = fetchurl { + url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.dmg"; + hash = "sha256-8xfjAWgtSdbD8gGlkGzT8QRz7egIf4PE/rFsFEDX0+c="; + }; + + buildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -r *.app "$out/Applications" + cp -r CLI/xld "$out/bin" + + runHook postInstall + ''; + + postPatch = '' + substituteInPlace CLI/xld \ + --replace "/Applications/XLD.app" "$out/Applications/XLD.app" + ''; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "xld-update-script"; + runtimeInputs = [ + curl + xmlstarlet + common-updater-scripts + ]; + text = '' + url=$(curl --silent "https://svn.code.sf.net/p/xld/code/appcast/xld-appcast_e.xml") + version=$(echo "$url" | xmlstarlet sel -t -v "substring-before(substring-after(//enclosure/@url, 'version='), '&')") + update-source-version xld "$version" --file=./pkgs/by-name/xl/xld/package.nix + ''; + }); + + meta = { + description = "Lossless audio decoder"; + homepage = "https://tmkk.undo.jp/xld/index_e.html"; + license = lib.licenses.osl3; + maintainers = with lib.maintainers; [ iivusly ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "xld"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix index c18875ca26..4deffbe85e 100644 --- a/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.10"; + version = "2024.12"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-h5jChYlTzKenZl0EnScU+vA+535pICXKdUhj8zAU4wc="; + hash = "sha256-ebF7G/2C9KiFnMjtBg0QwniAXBQgpIduxuMnidr+Wg8="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix index 8e384f8ef9..20bcbd76f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsct"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "faf0"; repo = "sct"; - rev = finalAttrs.version; - hash = "sha256-PDkbZTtl14wYdfALv43SIU9MKhbfiYlRqkI1mFn1qa4="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-L93Gk7/jcRoUWogWhrOiBvWCCj+EbyGKxBR5oOVjPPU="; }; buildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Set color temperature of screen"; mainProgram = "xsct"; homepage = "https://github.com/faf0/sct"; + changelog = "https://github.com/faf0/sct/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.unlicense; maintainers = with maintainers; [ OPNA2608 ]; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix b/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix new file mode 100644 index 0000000000..bf8f60dc09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, xwayland +, xcb-util-cursor +, libxcb +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "xwayland-satellite"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "Supreeeme"; + repo = "xwayland-satellite"; + rev = "v${version}"; + hash = "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI="; + }; + + cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + xwayland + libxcb + xcb-util-cursor + ]; + + # disable Xwayland integration tests which need a running display server + checkFlags = [ + "--exact" + "--skip=copy_from_wayland" + "--skip=copy_from_x11" + "--skip=input_focus" + "--skip=quick_delete" + "--skip=reparent" + "--skip=toplevel_flow" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; + homepage = "https://github.com/Supreeeme/xwayland-satellite"; + license = licenses.mpl20; + maintainers = with maintainers; [ if-loop69420 ]; + mainProgram = "xwayland-satellite"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix index d9833e251a..c6879884f1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix @@ -142,7 +142,6 @@ stdenv'.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ cmacrae shardy - ivar khaneliman ]; sourceProvenance = diff --git a/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation new file mode 100644 index 0000000000..df068b97d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation @@ -0,0 +1,16 @@ +CONFIG_DIR=$YS/config +if [ ! -d $CONFIG_DIR ]; then + mkdir -p $CONFIG_DIR +fi + +REGISTRY=$CONFIG_DIR/registry8.xml +if [ ! -e $REGISTRY ]; then + cat >$REGISTRY < + + + + + +EOF +fi diff --git a/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/package.nix new file mode 100644 index 0000000000..b2d5451a93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/package.nix @@ -0,0 +1,95 @@ +{ fetchzip +, lib +, stdenvNoCC +, copyDesktopItems +, imagemagick +, makeDesktopItem +, jre +}: +let + vPath = v: lib.elemAt (lib.splitString "-" v) 0; + + version = "2024.3-b157"; + + arches = { + aarch64-linux = "arm64"; + x86_64-linux = "x64"; + }; + + arch = + arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); + + hashes = { + arm64 = "sha256-0a9maZhgtXH21Ph0o3Rb+rCPhAmZRxjZCRyDmTvusLk="; + x64 = "sha256-nLaOOkPG2QEHkHd0S2AYLT2IpkMchGw9adyUDLCNQFg="; + }; + + desktopItem = makeDesktopItem { + name = "YourKit Java Profiler"; + desktopName = "YourKit Java Profiler " + version; + type = "Application"; + exec = "yourkit-java-profiler %f"; + icon = "yourkit-java-profiler"; + categories = [ "Development" "Java" "Profiling" ]; + terminal = false; + startupWMClass = "YourKit Java Profiler"; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + + pname = "yourkit-java"; + + src = fetchzip { + url = "https://download.yourkit.com/yjp/${vPath version}/YourKit-JavaProfiler-${version}-${arch}.zip"; + hash = hashes.${arch}; + }; + + nativeBuildInputs = [ copyDesktopItems imagemagick ]; + + buildInputs = [ jre ]; + + desktopItems = [ desktopItem ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -pr bin lib license.html license-redist.txt probes samples $out + cp ${./forbid-desktop-item-creation} $out/bin/forbid-desktop-item-creation + mv $out/bin/profiler.sh $out/bin/yourkit-java-profiler + mkdir -p $out/share/icons + convert $out/bin/profiler.ico\[0] \ + -size 256x256 \ + $out/share/icons/yourkit-java-profiler.png + rm $out/bin/profiler.ico + rm -rf $out/bin/{windows-*,mac,linux-{*-32,musl-*,ppc-*}} + if [[ ${arch} = x64 ]]; then + rm -rf $out/bin/linux-arm-64 + else + rm -rf $out/bin/linux-x86-64 + fi + substituteInPlace $out/bin/yourkit-java-profiler \ + --replace 'JAVA_EXE="$YD/jre64/bin/java"' JAVA_EXE=${jre}/bin/java + # Use our desktop item, which will be purged when this package + # gets removed + sed -i -e "/^YD=/isource $out/bin/forbid-desktop-item-creation\\ + " \ + $out/bin/yourkit-java-profiler + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms"; + homepage = "https://www.yourkit.com"; + changelog = "https://www.yourkit.com/changes/"; + license = licenses.unfree; + mainProgram = "yourkit-java-profiler"; + platforms = attrNames arches; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ herberteuler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/update.sh b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/update.sh new file mode 100755 index 0000000000..0b95732f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/yourkit-java/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl gawk gnused nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +DRV_BASE=package.nix +NIX_DRV="$ROOT/$DRV_BASE" +if [[ ! -f "$NIX_DRV" ]]; then + echo "ERROR: cannot find $DRV_BASE in $ROOT" + exit 1 +fi + +function retrieve_latest_version () { + curl https://www.yourkit.com/java/profiler/download/ \ + | grep -Eo '(Version|Build): ([a-z0-9#.-])+' \ + | awk '{ print $2 }' \ + | tr -d '\n' \ + | sed 's/#/-b/' +} + +function calc_hash () { + local version=$1 + local url=$2 + nix-prefetch --option extra-experimental-features flakes \ + "{ stdenv, fetchzip }: +stdenv.mkDerivation { + pname = \"yourkit-java-binary\"; + version = \"$version\"; + src = fetchzip { + url = \"$url\"; + }; +}" +} + +function update_hash () { + local arch=$1 + local version=$2 + local date=$(echo $version | sed 's/-.*//') + local url=https://download.yourkit.com/yjp/$date/YourKit-JavaProfiler-$version-$arch.zip + local hash=$(calc_hash $version $url) + sed -i -e "s|^.*$arch.*=.*\"sha256-.*$| $arch = \"$hash\";|" $NIX_DRV +} + +version=$(retrieve_latest_version) +sed -i -e "s|^.*version.*=.*\".*$| version = \"$version\";|" $NIX_DRV +for arch in arm64 x64; do + update_hash $arch $version +done + +# Local variables: +# mode: shell-script +# eval: (sh-set-shell "bash") +# End: diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock index c47b14abbd..4488e24f16 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -110,6 +110,29 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "alacritty_terminal" +version = "0.24.1-dev" +source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f" +dependencies = [ + "base64 0.22.0", + "bitflags 2.4.2", + "home", + "libc", + "log", + "miow", + "parking_lot", + "piper", + "polling 3.3.2", + "regex-automata 0.4.5", + "rustix-openpty", + "serde", + "signal-hook", + "unicode-width", + "vte", + "windows-sys 0.52.0", +] + [[package]] name = "aliasable" version = "0.1.3" @@ -230,6 +253,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "strum", "tokio", ] @@ -337,6 +361,7 @@ version = "0.1.0" dependencies = [ "anthropic", "anyhow", + "assistant_slash_command", "cargo_toml", "chrono", "client", @@ -345,31 +370,40 @@ dependencies = [ "ctor", "editor", "env_logger", - "feature_flags", "file_icons", "fs", "futures 0.3.28", + "fuzzy", "gpui", + "heed", + "html_to_markdown", "http 0.1.0", "indoc", "language", "log", "menu", "multi_buffer", + "ollama", "open_ai", "ordered-float 2.10.0", "parking_lot", + "paths", + "picker", "project", "rand 0.8.5", "regex", "rope", + "rustdoc", "schemars", "search", + "semantic_index", "serde", "serde_json", "settings", + "similar", "smol", "strsim 0.11.1", + "strum", "telemetry_events", "theme", "tiktoken-rs", @@ -382,45 +416,16 @@ dependencies = [ ] [[package]] -name = "assistant2" +name = "assistant_slash_command" version = "0.1.0" dependencies = [ "anyhow", - "assets", - "assistant_tooling", - "chrono", - "client", "collections", - "editor", - "env_logger", - "feature_flags", - "file_icons", - "fs", - "futures 0.3.28", - "fuzzy", + "derive_more", "gpui", - "http 0.1.0", "language", - "languages", - "log", - "markdown", - "node_runtime", - "open_ai", - "picker", - "project", - "rand 0.8.5", - "regex", - "release_channel", - "schemars", - "semantic_index", + "parking_lot", "serde", - "serde_json", - "settings", - "story", - "theme", - "ui", - "unindent", - "util", "workspace", ] @@ -445,6 +450,16 @@ dependencies = [ "util", ] +[[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-broadcast" version = "0.7.0" @@ -508,6 +523,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-dispatcher" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8bff43baa5b0ca8f8bcd7f9338f5d30fbd75236a2aa89130a7c5121a06d6ca" +dependencies = [ + "async-task", + "futures-lite 1.13.0", +] + [[package]] name = "async-executor" version = "1.5.1" @@ -757,6 +782,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", @@ -859,6 +885,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "asynchronous-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" +dependencies = [ + "bytes 1.5.0", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", +] + [[package]] name = "atoi" version = "2.0.0" @@ -1535,7 +1574,7 @@ dependencies = [ [[package]] name = "blade-graphics" version = "0.4.0" -source = "git+https://github.com/kvark/blade?rev=e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c#e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" +source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d" dependencies = [ "ash", "ash-window", @@ -1565,13 +1604,24 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c#e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" +source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d" dependencies = [ "proc-macro2", "quote", "syn 2.0.59", ] +[[package]] +name = "blade-util" +version = "0.1.0" +source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d" +dependencies = [ + "blade-graphics", + "bytemuck", + "log", + "profiling", +] + [[package]] name = "block" version = "0.1.6" @@ -1796,9 +1846,9 @@ dependencies = [ [[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.4.2", "log", @@ -1810,9 +1860,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 0.38.32", @@ -2009,9 +2059,9 @@ 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", @@ -2019,7 +2069,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2161,8 +2211,8 @@ dependencies = [ "exec", "fork", "ipc-channel", - "libc", "once_cell", + "paths", "plist", "release_channel", "serde", @@ -2222,8 +2272,10 @@ dependencies = [ "async-tungstenite", "chrono", "clock", + "cocoa", "collections", "feature_flags", + "fs", "futures 0.3.28", "gpui", "http 0.1.0", @@ -2231,6 +2283,7 @@ dependencies = [ "log", "once_cell", "parking_lot", + "paths", "postage", "rand 0.8.5", "release_channel", @@ -2250,6 +2303,8 @@ dependencies = [ "tiny_http", "url", "util", + "windows 0.57.0", + "worktree", ] [[package]] @@ -2376,6 +2431,7 @@ dependencies = [ "prometheus", "prost", "rand 0.8.5", + "recent_projects", "release_channel", "reqwest", "rpc", @@ -2406,6 +2462,7 @@ dependencies = [ "util", "uuid", "workspace", + "worktree", ] [[package]] @@ -2418,11 +2475,13 @@ dependencies = [ "channel", "client", "collections", + "command_palette", "db", "dev_server_projects", "editor", "emojis", "extensions_ui", + "feedback", "futures 0.3.28", "fuzzy", "gpui", @@ -2465,13 +2524,6 @@ dependencies = [ "rustc-hash", ] -[[package]] -name = "color" -version = "0.1.0" -dependencies = [ - "palette", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -2623,6 +2675,7 @@ dependencies = [ "menu", "node_runtime", "parking_lot", + "paths", "project", "rpc", "serde", @@ -2635,20 +2688,6 @@ dependencies = [ "workspace", ] -[[package]] -name = "copypasta" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" -dependencies = [ - "clipboard-win", - "objc", - "objc-foundation", - "objc_id", - "smithay-clipboard", - "x11-clipboard", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -2739,14 +2778,13 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c578f2b9abb4d5f3fbb12aba4008084d435dc6a8425c195cfe0b3594bfea0c25" +source = "git+https://github.com/pop-os/cosmic-text?rev=542b20c#542b20ca4376a3b5de5fa629db1a4ace44e18e0c" dependencies = [ "bitflags 2.4.2", "fontdb", - "libm", "log", "rangemap", + "rayon", "rustc-hash", "rustybuzz", "self_cell", @@ -2825,7 +2863,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "log", "regalloc2", "smallvec", @@ -3145,7 +3183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -3178,6 +3216,7 @@ dependencies = [ "indoc", "lazy_static", "log", + "paths", "release_channel", "smol", "sqlez", @@ -3225,10 +3264,11 @@ 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", "serde", ] @@ -3347,22 +3387,22 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "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]] @@ -3386,6 +3426,18 @@ dependencies = [ "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" @@ -3463,6 +3515,7 @@ version = "0.1.0" dependencies = [ "aho-corasick", "anyhow", + "assets", "client", "clock", "collections", @@ -3637,11 +3690,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] @@ -3768,6 +3822,7 @@ name = "extension" version = "0.1.0" dependencies = [ "anyhow", + "assistant_slash_command", "async-compression", "async-tar", "async-trait", @@ -3786,7 +3841,9 @@ dependencies = [ "lsp", "node_runtime", "parking_lot", + "paths", "project", + "release_channel", "schemars", "semantic_version", "serde", @@ -3796,6 +3853,7 @@ dependencies = [ "task", "theme", "toml 0.8.10", + "ui", "url", "util", "wasm-encoder", @@ -3803,6 +3861,7 @@ dependencies = [ "wasmtime", "wasmtime-wasi", "wit-component", + "workspace", ] [[package]] @@ -3839,8 +3898,10 @@ dependencies = [ "fuzzy", "gpui", "language", + "num-format", "picker", "project", + "release_channel", "semantic_version", "serde", "settings", @@ -4097,9 +4158,12 @@ dependencies = [ [[package]] name = "font-types" -version = "0.4.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] [[package]] name = "fontconfig-parser" @@ -4112,9 +4176,9 @@ dependencies = [ [[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", @@ -4210,6 +4274,7 @@ name = "fs" version = "0.1.0" dependencies = [ "anyhow", + "ashpd", "async-tar", "async-trait", "cocoa", @@ -4224,6 +4289,7 @@ dependencies = [ "notify", "objc", "parking_lot", + "paths", "rope", "serde", "serde_json", @@ -4232,7 +4298,7 @@ dependencies = [ "text", "time", "util", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -4522,7 +4588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", - "indexmap 2.0.0", + "indexmap 2.2.6", "stable_deref_trait", ] @@ -4552,14 +4618,14 @@ dependencies = [ "unindent", "url", "util", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "git2" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ "bitflags 2.4.2", "libc", @@ -4708,14 +4774,15 @@ dependencies = [ "bindgen 0.65.1", "blade-graphics", "blade-macros", + "blade-util", "block", "bytemuck", "calloop", "calloop-wayland-source", "cbindgen", + "clipboard-win", "cocoa", "collections", - "copypasta", "core-foundation", "core-graphics", "core-text", @@ -4774,8 +4841,9 @@ dependencies = [ "wayland-cursor", "wayland-protocols", "wayland-protocols-plasma", - "windows 0.56.0", - "windows-core 0.56.0", + "windows 0.57.0", + "windows-core 0.57.0", + "x11-clipboard", "x11rb", "xim", "xkbcommon", @@ -4856,9 +4924,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.8", "allocator-api2", @@ -4870,7 +4938,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -4913,7 +4981,7 @@ dependencies = [ "project", "rpc", "settings", - "shellexpand", + "shellexpand 2.1.2", "signal-hook", "util", ] @@ -4938,8 +5006,9 @@ dependencies = [ [[package]] name = "heed" -version = "0.20.0-alpha.9" -source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f7acb9683d7c7068aa46d47557bfa4e35a277964b350d9504a87b03610163fd" dependencies = [ "bitflags 2.4.2", "byteorder", @@ -4956,13 +5025,15 @@ dependencies = [ [[package]] name = "heed-traits" -version = "0.20.0-alpha.9" -source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0-alpha.9" -source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" dependencies = [ "bincode", "byteorder", @@ -5052,6 +5123,32 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" +[[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.59", +] + +[[package]] +name = "html_to_markdown" +version = "0.1.0" +dependencies = [ + "anyhow", + "html5ever", + "indoc", + "markup5ever_rcdom", + "pretty_assertions", + "regex", +] + [[package]] name = "http" version = "0.1.0" @@ -5288,12 +5385,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "serde", ] @@ -5327,6 +5424,7 @@ dependencies = [ "indoc", "language", "lsp", + "paths", "project", "serde_json", "settings", @@ -5523,9 +5621,9 @@ 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 = "jni" @@ -5582,7 +5680,7 @@ dependencies = [ "schemars", "serde", "settings", - "shellexpand", + "shellexpand 2.1.2", "workspace", ] @@ -5711,7 +5809,7 @@ dependencies = [ "tree-sitter-embedded-template", "tree-sitter-heex", "tree-sitter-html", - "tree-sitter-json 0.20.0", + "tree-sitter-json", "tree-sitter-markdown", "tree-sitter-ruby", "tree-sitter-rust", @@ -5780,6 +5878,7 @@ dependencies = [ "log", "lsp", "node_runtime", + "paths", "project", "regex", "rope", @@ -5801,7 +5900,7 @@ dependencies = [ "tree-sitter-gomod", "tree-sitter-gowork", "tree-sitter-jsdoc", - "tree-sitter-json 0.20.0", + "tree-sitter-json", "tree-sitter-markdown", "tree-sitter-proto", "tree-sitter-python", @@ -5849,9 +5948,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[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", @@ -6010,8 +6109,9 @@ dependencies = [ [[package]] name = "lmdb-master-sys" -version = "0.1.0" -source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc9048db3a58c0732d7236abc4909058f9d2708cfb6d7d047eb895fddec6419a" dependencies = [ "cc", "doxygen-rs", @@ -6030,9 +6130,9 @@ 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 = [ "serde", "value-bag", @@ -6058,13 +6158,13 @@ dependencies = [ "serde_json", "smol", "util", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "lsp-types" version = "0.95.1" -source = "git+https://github.com/zed-industries/lsp-types?branch=apply-snippet-edit#853c7881d200777e20799026651ca36727144646" +source = "git+https://github.com/zed-industries/lsp-types?rev=72357d6f6d212bdffba3b5ef4b31d8ca856058e7#72357d6f6d212bdffba3b5ef4b31d8ca856058e7" dependencies = [ "bitflags 1.3.2", "serde", @@ -6166,6 +6266,32 @@ dependencies = [ "workspace", ] +[[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 = "matchers" version = "0.1.0" @@ -6392,7 +6518,7 @@ dependencies = [ "bitflags 2.4.2", "codespan-reporting", "hexf-parse", - "indexmap 2.0.0", + "indexmap 2.2.6", "log", "num-traits", "rustc-hash", @@ -6521,6 +6647,7 @@ dependencies = [ "futures 0.3.28", "http 0.1.0", "log", + "paths", "semver", "serde", "serde_json", @@ -6528,7 +6655,7 @@ dependencies = [ "tempfile", "util", "walkdir", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -6665,6 +6792,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" @@ -6676,6 +6809,16 @@ dependencies = [ "syn 1.0.109", ] +[[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" @@ -6786,17 +6929,6 @@ dependencies = [ "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" @@ -6806,15 +6938,6 @@ 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.1" @@ -6822,8 +6945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.14.0", - "indexmap 2.0.0", + "hashbrown 0.14.5", + "indexmap 2.2.6", "memchr", ] @@ -6850,6 +6973,19 @@ dependencies = [ "cc", ] +[[package]] +name = "ollama" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.28", + "http 0.1.0", + "isahc", + "schemars", + "serde", + "serde_json", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -6919,6 +7055,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "strum", ] [[package]] @@ -6975,6 +7112,12 @@ dependencies = [ "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.0" @@ -7048,7 +7191,6 @@ dependencies = [ "project", "rope", "serde_json", - "settings", "smol", "theme", "tree-sitter-rust", @@ -7058,6 +7200,30 @@ dependencies = [ "workspace", ] +[[package]] +name = "outline_panel" +version = "0.1.0" +dependencies = [ + "anyhow", + "collections", + "db", + "editor", + "file_icons", + "gpui", + "itertools 0.11.0", + "language", + "log", + "menu", + "project", + "schemars", + "serde", + "serde_json", + "settings", + "util", + "workspace", + "worktree", +] + [[package]] name = "outref" version = "0.5.1" @@ -7197,6 +7363,14 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "paths" +version = "0.1.0" +dependencies = [ + "dirs 4.0.0", + "util", +] + [[package]] name = "pbkdf2" version = "0.8.0" @@ -7255,7 +7429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.2.6", ] [[package]] @@ -7265,7 +7439,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared", + "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 0.8.5", ] [[package]] @@ -7274,7 +7468,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -7284,13 +7478,22 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", "syn 2.0.59", ] +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", +] + [[package]] name = "phf_shared" version = "0.11.2" @@ -7522,12 +7725,24 @@ dependencies = [ "thiserror", ] +[[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 = "prettier" version = "0.1.0" @@ -7541,6 +7756,7 @@ dependencies = [ "lsp", "node_runtime", "parking_lot", + "paths", "serde", "serde_json", "util", @@ -7672,6 +7888,8 @@ dependencies = [ "lsp", "node_runtime", "parking_lot", + "pathdiff", + "paths", "postage", "prettier", "pretty_assertions", @@ -7692,6 +7910,7 @@ dependencies = [ "tempfile", "terminal", "text", + "unicase", "unindent", "util", "which 6.0.0", @@ -7722,9 +7941,9 @@ dependencies = [ "settings", "theme", "ui", - "unicase", "util", "workspace", + "worktree", ] [[package]] @@ -7817,6 +8036,17 @@ dependencies = [ "prost", ] +[[package]] +name = "proto" +version = "0.1.0" +dependencies = [ + "anyhow", + "collections", + "prost", + "prost-build", + "serde", +] + [[package]] name = "protobuf" version = "2.28.0" @@ -8032,10 +8262,11 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.15.3" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1362980db95801b70031dd592dc052a44b1810ca9da8fbcf7b25983f3174ed0" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" dependencies = [ + "bytemuck", "font-types", ] @@ -8208,6 +8439,38 @@ dependencies = [ "thiserror", ] +[[package]] +name = "repl" +version = "0.1.0" +dependencies = [ + "alacritty_terminal 0.23.0", + "anyhow", + "async-dispatcher", + "base64 0.13.1", + "collections", + "editor", + "env_logger", + "futures 0.3.28", + "gpui", + "http 0.1.0", + "image", + "language", + "log", + "project", + "runtimelib", + "schemars", + "serde", + "serde_json", + "settings", + "smol", + "terminal_view", + "theme", + "ui", + "util", + "uuid", + "workspace", +] + [[package]] name = "reqwest" version = "0.11.20" @@ -8400,8 +8663,7 @@ dependencies = [ "futures 0.3.28", "gpui", "parking_lot", - "prost", - "prost-build", + "proto", "rand 0.8.5", "rsa 0.4.0", "serde", @@ -8454,6 +8716,32 @@ dependencies = [ "zeroize", ] +[[package]] +name = "runtimelib" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a4a788465cf51b7ac8f36e4e4ca3dd26013dcddd5ba8376f98752278244294" +dependencies = [ + "anyhow", + "async-dispatcher", + "async-std", + "base64 0.22.0", + "bytes 1.5.0", + "chrono", + "data-encoding", + "dirs 5.0.1", + "futures 0.3.28", + "glob", + "rand 0.8.5", + "ring", + "serde", + "serde_json", + "shellexpand 3.1.0", + "smol", + "uuid", + "zeromq", +] + [[package]] name = "rust-embed" version = "8.4.0" @@ -8526,6 +8814,31 @@ dependencies = [ "semver", ] +[[package]] +name = "rustdoc" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "collections", + "derive_more", + "fs", + "futures 0.3.28", + "fuzzy", + "gpui", + "heed", + "html_to_markdown", + "http 0.1.0", + "indexmap 1.9.3", + "indoc", + "parking_lot", + "paths", + "pretty_assertions", + "serde", + "strum", + "util", +] + [[package]] name = "rustix" version = "0.37.23" @@ -8617,9 +8930,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ "bitflags 2.4.2", "bytemuck", @@ -8634,9 +8947,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safemem" @@ -8965,18 +9278,18 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", @@ -9005,11 +9318,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -9021,7 +9334,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26386958a1344003f2b2bcff51a23fbe70461a478ef29247c6c6ab2c1656f53e" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -9080,6 +9393,7 @@ dependencies = [ "gpui", "indoc", "lazy_static", + "paths", "pretty_assertions", "release_channel", "rust-embed", @@ -9090,7 +9404,7 @@ dependencies = [ "serde_json_lenient", "smallvec", "tree-sitter", - "tree-sitter-json 0.19.0", + "tree-sitter-json", "unindent", "util", ] @@ -9173,6 +9487,15 @@ dependencies = [ "dirs 4.0.0", ] +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + [[package]] name = "shlex" version = "1.3.0" @@ -9280,6 +9603,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +[[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" @@ -9321,42 +9654,6 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.4.2", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.32", - "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" version = "1.3.0" @@ -9394,12 +9691,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -9537,7 +9834,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.2.6", "log", "memchr", "once_cell", @@ -9774,6 +10071,32 @@ dependencies = [ "float-cmp", ] +[[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 = "stringprep" version = "0.1.4" @@ -9870,10 +10193,10 @@ dependencies = [ "anyhow", "futures 0.3.28", "http 0.1.0", + "paths", "serde", "serde_json", "smol", - "util", ] [[package]] @@ -9962,11 +10285,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.12" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" dependencies = [ - "read-fonts", + "skrifa", "yazi", "zeno", ] @@ -10116,7 +10439,7 @@ dependencies = [ "serde", "serde_json_lenient", "sha2 0.10.7", - "shellexpand", + "shellexpand 2.1.2", "util", ] @@ -10124,6 +10447,7 @@ dependencies = [ name = "tasks_ui" version = "0.1.0" dependencies = [ + "anyhow", "editor", "file_icons", "fuzzy", @@ -10189,7 +10513,7 @@ dependencies = [ name = "terminal" version = "0.1.0" dependencies = [ - "alacritty_terminal", + "alacritty_terminal 0.24.1-dev", "anyhow", "collections", "dirs 4.0.0", @@ -10208,7 +10532,7 @@ dependencies = [ "theme", "thiserror", "util", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -10231,7 +10555,7 @@ dependencies = [ "serde", "serde_json", "settings", - "shellexpand", + "shellexpand 2.1.2", "smol", "task", "tasks_ui", @@ -10277,12 +10601,12 @@ version = "0.1.0" dependencies = [ "anyhow", "collections", - "color", "derive_more", "fs", "futures 0.3.28", "gpui", "indexmap 1.9.3", + "log", "palette", "parking_lot", "refineable", @@ -10396,12 +10720,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", @@ -10409,16 +10735,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", ] @@ -10507,9 +10834,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes 1.5.0", @@ -10519,7 +10846,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -10537,9 +10864,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", @@ -10652,7 +10979,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -10665,7 +10992,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.15", ] @@ -10676,7 +11003,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -10845,8 +11172,9 @@ dependencies = [ [[package]] name = "tree-sitter-bash" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=7331995b19b8f8aba2d5e26deb51d2195c18bc94#7331995b19b8f8aba2d5e26deb51d2195c18bc94" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906" dependencies = [ "cc", "tree-sitter", @@ -10864,8 +11192,9 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=f44509141e7e483323d2ec178f2d2e6c0fc041c1#f44509141e7e483323d2ec178f2d2e6c0fc041c1" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" dependencies = [ "cc", "tree-sitter", @@ -10873,8 +11202,9 @@ dependencies = [ [[package]] name = "tree-sitter-css" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-css?rev=769203d0f9abe1a9a691ac2b9fe4bb4397a73c51#769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3306ddefa1d2681adda2613d11974ffabfbeb215e23235da6c862f3493a04fd" dependencies = [ "cc", "tree-sitter", @@ -10882,8 +11212,9 @@ dependencies = [ [[package]] name = "tree-sitter-elixir" -version = "0.1.0" -source = "git+https://github.com/elixir-lang/tree-sitter-elixir?rev=a2861e88a730287a60c11ea9299c033c7d076e30#a2861e88a730287a60c11ea9299c033c7d076e30" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc0b1f3e6d9f12ca22ae5171f32fd154e3aea29dff565d05ef785c28931415b" dependencies = [ "cc", "tree-sitter", @@ -10910,8 +11241,9 @@ dependencies = [ [[package]] name = "tree-sitter-gomod" -version = "1.0.2" -source = "git+https://github.com/camdencheek/tree-sitter-go-mod#bbe2fe3be4b87e06a613e685250f473d2267f430" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d0a848a3a4a383fb97ef91241d972c3b996567cdc59040ad2c6fc48b874992" dependencies = [ "cc", "tree-sitter", @@ -10956,18 +11288,9 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-json?rev=40a81c01a40ac48744e0c8ccabbaba1920441199#40a81c01a40ac48744e0c8ccabbaba1920441199" +checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" dependencies = [ "cc", "tree-sitter", @@ -11033,8 +11356,9 @@ dependencies = [ [[package]] name = "tree-sitter-typescript" -version = "0.20.2" -source = "git+https://github.com/tree-sitter/tree-sitter-typescript?rev=5d20856f34315b068c41edaee2ac8a100081d259#5d20856f34315b068c41edaee2ac8a100081d259" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8bc1d2c24276a48ef097a71b56888ac9db63717e8f8d0b324668a27fd619670" dependencies = [ "cc", "tree-sitter", @@ -11043,7 +11367,8 @@ dependencies = [ [[package]] name = "tree-sitter-yaml" version = "0.0.1" -source = "git+https://github.com/zed-industries/tree-sitter-yaml?rev=f545a41f57502e1b5ddf2a6668896c1b0620f930#f545a41f57502e1b5ddf2a6668896c1b0620f930" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324767d0ad6bc588467aa4b98f6f5cd6eda64ece1eae568f8fcf5b899bcf0fe9" dependencies = [ "cc", "tree-sitter", @@ -11057,9 +11382,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[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 = "tungstenite" @@ -11100,6 +11425,12 @@ dependencies = [ "utf-8", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -11125,12 +11456,13 @@ dependencies = [ "gpui", "itertools 0.11.0", "menu", + "serde", "settings", "smallvec", "story", "strum", "theme", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -11161,15 +11493,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[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" @@ -11299,12 +11631,11 @@ dependencies = [ "anyhow", "async-fs 1.6.0", "collections", - "dirs 3.0.2", + "dirs 4.0.0", "futures 0.3.28", "futures-lite 1.13.0", "git2", "globset", - "lazy_static", "log", "rand 0.8.5", "regex", @@ -11319,9 +11650,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.10", "serde", @@ -11336,9 +11667,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -11346,9 +11677,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.4.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" +checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b" dependencies = [ "erased-serde", "serde", @@ -11357,9 +11688,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.4.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b" dependencies = [ "sval", "sval_buffer", @@ -11610,7 +11941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fd83062c17b9f4985d438603cde0a5e8c5c8198201a6937f778b607924c7da2" dependencies = [ "anyhow", - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -11626,7 +11957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" dependencies = [ "bitflags 2.4.2", - "indexmap 2.0.0", + "indexmap 2.2.6", "semver", ] @@ -11653,7 +11984,7 @@ dependencies = [ "cfg-if", "encoding_rs", "gimli", - "indexmap 2.0.0", + "indexmap 2.2.6", "libc", "log", "object", @@ -11784,7 +12115,7 @@ dependencies = [ "cpp_demangle", "cranelift-entity", "gimli", - "indexmap 2.0.0", + "indexmap 2.2.6", "log", "object", "rustc-demangle", @@ -11835,7 +12166,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.0.0", + "indexmap 2.2.6", "libc", "log", "mach", @@ -11940,7 +12271,7 @@ checksum = "96326c9800fb6c099f50d1bd2126d636fc2f96950e1675acf358c0f52516cd38" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.0.0", + "indexmap 2.2.6", "wit-parser", ] @@ -11985,17 +12316,6 @@ dependencies = [ "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.4.2", - "cursor-icon", - "wayland-backend", -] - [[package]] name = "wayland-cursor" version = "0.31.1" @@ -12032,19 +12352,6 @@ dependencies = [ "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" @@ -12174,7 +12481,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "shellexpand", + "shellexpand 2.1.2", "syn 2.0.59", "witx", ] @@ -12209,11 +12516,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]] @@ -12268,11 +12575,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.56.0", + "windows-core 0.57.0", "windows-targets 0.52.5", ] @@ -12287,9 +12594,9 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement", "windows-interface", @@ -12299,9 +12606,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", @@ -12310,9 +12617,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", @@ -12635,7 +12942,7 @@ checksum = "d8a39a15d1ae2077688213611209849cad40e9e5cccf6e61951a425850677ff3" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.0.0", + "indexmap 2.2.6", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -12663,7 +12970,7 @@ checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825" dependencies = [ "anyhow", "bitflags 2.4.2", - "indexmap 2.0.0", + "indexmap 2.2.6", "log", "serde", "serde_derive", @@ -12682,7 +12989,7 @@ checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6" dependencies = [ "anyhow", "id-arena", - "indexmap 2.0.0", + "indexmap 2.2.6", "log", "semver", "serde", @@ -12750,9 +13057,9 @@ name = "worktree" version = "0.1.0" dependencies = [ "anyhow", - "client", "clock", "collections", + "env_logger", "fs", "futures 0.3.28", "fuzzy", @@ -12761,10 +13068,8 @@ dependencies = [ "gpui", "http 0.1.0", "ignore", - "itertools 0.11.0", "language", "log", - "lsp", "parking_lot", "postage", "pretty_assertions", @@ -12849,7 +13154,7 @@ version = "0.4.0" source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" dependencies = [ "ahash 0.8.8", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "log", "x11rb", "xim-ctext", @@ -12890,6 +13195,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +[[package]] +name = "xml5ever" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c376f76ed09df711203e20c3ef5ce556f0166fa03d39590016c0fd625437fad" +dependencies = [ + "log", + "mac", + "markup5ever", +] + [[package]] name = "xmlparser" version = "0.13.5" @@ -13002,10 +13318,11 @@ dependencies = [ [[package]] name = "zed" -version = "0.137.6" +version = "0.141.3" dependencies = [ "activity_indicator", "anyhow", + "ashpd", "assets", "assistant", "audio", @@ -13058,7 +13375,9 @@ dependencies = [ "node_runtime", "notifications", "outline", + "outline_panel", "parking_lot", + "paths", "profiling", "project", "project_panel", @@ -13066,6 +13385,7 @@ dependencies = [ "quick_action_bar", "recent_projects", "release_channel", + "repl", "rope", "search", "serde", @@ -13081,7 +13401,9 @@ dependencies = [ "terminal_view", "theme", "theme_selector", + "tree-sitter-markdown", "tree-sitter-rust", + "ui", "urlencoding", "util", "uuid", @@ -13125,28 +13447,28 @@ dependencies = [ name = "zed_dart" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_deno" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_elixir" -version = "0.0.4" +version = "0.0.5" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_elm" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] @@ -13175,6 +13497,8 @@ dependencies = [ [[package]] name = "zed_extension_api" version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca8bcaea3feb2d2ce9dbeb061ee48365312a351faa7014c417b0365fe9e459" dependencies = [ "serde", "serde_json", @@ -13183,9 +13507,7 @@ dependencies = [ [[package]] name = "zed_extension_api" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca8bcaea3feb2d2ce9dbeb061ee48365312a351faa7014c417b0365fe9e459" +version = "0.0.7" dependencies = [ "serde", "serde_json", @@ -13196,47 +13518,47 @@ dependencies = [ name = "zed_gleam" version = "0.1.3" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.7", ] [[package]] name = "zed_glsl" version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_haskell" version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_html" version = "0.1.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_lua" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_ocaml" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_php" -version = "0.0.3" +version = "0.0.6" dependencies = [ "zed_extension_api 0.0.4", ] @@ -13257,30 +13579,38 @@ dependencies = [ [[package]] name = "zed_ruby" -version = "0.0.4" +version = "0.0.6" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", +] + +[[package]] +name = "zed_snippets" +version = "0.0.3" +dependencies = [ + "serde_json", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_svelte" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_terraform" version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_toml" version = "0.1.1" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] @@ -13292,16 +13622,16 @@ dependencies = [ [[package]] name = "zed_vue" -version = "0.0.2" +version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.6", ] [[package]] name = "zed_zig" version = "0.1.2" dependencies = [ - "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.7", ] [[package]] @@ -13350,6 +13680,33 @@ dependencies = [ "syn 2.0.59", ] +[[package]] +name = "zeromq" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0560d00172817b7f7c2265060783519c475702ae290b154115ca75e976d4d0" +dependencies = [ + "async-dispatcher", + "async-std", + "async-trait", + "asynchronous-codec", + "bytes 1.5.0", + "crossbeam-queue", + "dashmap", + "futures-channel", + "futures-io", + "futures-task", + "futures-util", + "log", + "num-traits", + "once_cell", + "parking_lot", + "rand 0.8.5", + "regex", + "thiserror", + "uuid", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix index bded3c04c5..a9875eccc0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + clang, copyDesktopItems, curl, perl, @@ -24,54 +25,50 @@ darwin, makeFontsConf, vulkan-loader, + envsubst, + nix-update-script, - withGLES ? false + withGLES ? false, }: assert withGLES -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.137.6"; + version = "0.141.3"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-1shK+Q8LTRaIXDqDLdJVsB4sAg2u5Kz0NXKf5jCniOU="; + hash = "sha256-D4wVHMNy7xESuEORULyKf3ZxFfRSKfWEXjBnjh3yBVU="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.4.0" = "sha256-w5BTv/40Zy94dmoZUpVVWrhzR2IaGAIJ0Ftsw1v/R9Y="; + "blade-graphics-0.4.0" = "sha256-khJke3tIO8V7tT3MBk9vQhBKTiJEWTY6Qr4vzeuKnOk="; + "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM="; "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8="; - "heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s="; - "lsp-types-0.95.1" = "sha256-ZWgQH7sUkP51oni2rqYX8Fsme/bGQV1TL5SbmEAhATU="; + "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8="; "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM="; "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE="; - "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; - "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; - "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; - "tree-sitter-elixir-0.1.0" = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog="; "tree-sitter-go-0.20.0" = "sha256-/mE21JSa3LWEiOgYPJcq0FYzTbBuNwp9JdZTZqmDIUU="; - "tree-sitter-gomod-1.0.2" = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI="; "tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg="; "tree-sitter-heex-0.0.1" = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM="; "tree-sitter-jsdoc-0.20.0" = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y="; - "tree-sitter-json-0.20.0" = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4="; "tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs="; "tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU="; - "tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; - "tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I="; "xim-0.4.0" = "sha256-vxu3tjkzGeoRUj7vyP0vDGI7fweX8Drgy9hwOUOEQIA="; }; }; nativeBuildInputs = [ + clang copyDesktopItems curl perl @@ -142,23 +139,38 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - mv $out/bin/Zed $out/bin/zed 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 - install -D ${src}/crates/zed/resources/zed.desktop $out/share/applications/dev.zed.Zed.desktop + + # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux + ( + export DO_STARTUP_NOTIFY="true" + export APP_CLI="zed" + export APP_ICON="zed" + export APP_NAME="Zed" + mkdir -p "$out/share/applications" + ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/zed.desktop" + ) ''; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(.*)" + ]; + }; + + meta = { description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter"; homepage = "https://zed.dev"; changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage niklaskorz ]; mainProgram = "zed"; - platforms = platforms.all; + platforms = lib.platforms.all; # Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618 broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix index e951b59eb4..9ba51b15ab 100644 --- a/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.8"; + version = "59.9"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-N3R/M0TS8XzRilQT4NFqIlfo2NqfunA38IrQBz5uaPg="; + hash = "sha256-1TmJHksFeiDjkIslA9FAZrWElgfCV1HOtS7H2pq8sHY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/common-updater/directory-listing-updater.nix b/third_party/nixpkgs/pkgs/common-updater/directory-listing-updater.nix index bd0b5b1df3..b717213fc3 100644 --- a/third_party/nixpkgs/pkgs/common-updater/directory-listing-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/directory-listing-updater.nix @@ -6,6 +6,7 @@ { pname ? null , version ? null , attrPath ? null +, allowedVersions ? "" , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false @@ -15,6 +16,6 @@ }: genericUpdater { - inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; + inherit pname version attrPath allowedVersions ignoredVersions rev-prefix odd-unstable patchlevel-unstable; versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"} ${lib.optionalString (extraRegex != null) "--extra-regex=${lib.escapeShellArg extraRegex}"}"; } diff --git a/third_party/nixpkgs/pkgs/common-updater/generic-updater.nix b/third_party/nixpkgs/pkgs/common-updater/generic-updater.nix index 2f8da2f308..2ebfb0fa6f 100644 --- a/third_party/nixpkgs/pkgs/common-updater/generic-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/generic-updater.nix @@ -13,6 +13,7 @@ , version ? null , attrPath ? null , versionLister +, allowedVersions ? "" , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false @@ -37,10 +38,11 @@ let version="$3" attr_path="$4" version_lister="$5" - ignored_versions="$6" - rev_prefix="$7" - odd_unstable="$8" - patchlevel_unstable="$9" + allowed_versions="$6" + ignored_versions="$7" + rev_prefix="$8" + odd_unstable="$9" + patchlevel_unstable="$${10}" [[ -n "$name" ]] || name="$UPDATE_NIX_NAME" [[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME" @@ -52,7 +54,7 @@ let function version_is_ignored() { local tag="$1" - [ -n "$ignored_versions" ] && ${grep} -E "$ignored_versions" <<< "$tag" + [ -n "$ignored_versions" ] && ${grep} -E -e "$ignored_versions" <<< "$tag" } function version_is_unstable() { @@ -86,6 +88,9 @@ let tags=$(echo "$tags" | ${sed} -e "s,^$rev_prefix,,") fi tags=$(echo "$tags" | ${grep} "^[0-9]") + if [ -n "$allowed_versions" ]; then + tags=$(echo "$tags" | ${grep} -E -e "$allowed_versions") + fi # sort the tags in decreasing order tags=$(echo "$tags" | ${coreutils}/bin/sort --reverse --version-sort) @@ -127,7 +132,7 @@ let in { name = "generic-update-script"; - command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]; + command = [ updateScript name pname version attrPath versionLister allowedVersions ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]; supportedFeatures = [ # Stdout must contain output according to the updateScript commit protocol when the update script finishes with a non-zero exit code. "commit" diff --git a/third_party/nixpkgs/pkgs/common-updater/git-updater.nix b/third_party/nixpkgs/pkgs/common-updater/git-updater.nix index 86bf88ada8..314799c23f 100644 --- a/third_party/nixpkgs/pkgs/common-updater/git-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/git-updater.nix @@ -6,6 +6,7 @@ { pname ? null , version ? null , attrPath ? null +, allowedVersions ? "" , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false @@ -16,6 +17,6 @@ }: genericUpdater { - inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; + inherit pname version attrPath allowedVersions ignoredVersions rev-prefix odd-unstable patchlevel-unstable; versionLister = "${common-updater-scripts}/bin/list-git-tags ${lib.optionalString (url != null) "--url=${url}"}"; } diff --git a/third_party/nixpkgs/pkgs/common-updater/http-two-levels-updater.nix b/third_party/nixpkgs/pkgs/common-updater/http-two-levels-updater.nix index 4656163c18..77594fc8a1 100644 --- a/third_party/nixpkgs/pkgs/common-updater/http-two-levels-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/http-two-levels-updater.nix @@ -6,6 +6,7 @@ { pname ? null , version ? null , attrPath ? null +, allowedVersions ? "" , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false @@ -14,6 +15,6 @@ }: genericUpdater { - inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; + inherit pname version attrPath allowedVersions ignoredVersions rev-prefix odd-unstable patchlevel-unstable; versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; } diff --git a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix index dc05465e0a..6cd429071a 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , cmake , extra-cmake-modules , pkg-config @@ -22,30 +21,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zeal"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${finalAttrs.version}"; - hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; + hash = "sha256-918hWy5be5mHINLbFJPiE29wlL1kRUD4MS3AjML/6fs="; }; - patches = [ - # fix build with qt 6.6.0 - # treewide: replace deprecated qAsConst with std::as_const() - # https://github.com/zealdocs/zeal/pull/1565 - (fetchpatch2 { - url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; - hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; - }) - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' - ''; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -64,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals isQt5 [ qtx11extras ]; + cmakeFlags = [ + (lib.cmakeBool "ZEAL_RELEASE_BUILD" true) + ]; + meta = { description = "Simple offline API documentation browser"; longDescription = '' @@ -71,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { app), available for Linux and Windows. ''; homepage = "https://zealdocs.org/"; - changelog = "https://github.com/zealdocs/zeal/releases"; + changelog = "https://github.com/zealdocs/zeal/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; mainProgram = "zeal"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 6e12c918cf..37fe1795bf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.1.1"; + version = "30.3.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index a3933935ad..26a4439c4d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0ymq4p5chaczhns24n4xal44ppay566pg95zkkkq51ck52f3zf44"; - IosevkaAile = "1v35phx8ki3yjg43s0fk8snpyc59pa8kg26q56hayxsfrj1dsmck"; - IosevkaCurly = "0d7sp0w7ryh8wwz4hxyhwimhw3ly668ygm4jcwf2amd3r4xxis5k"; - IosevkaCurlySlab = "1lajfma7jdwi453jgd3pq1vdgz5zn3f01j502dfiaskqzfan89cb"; - IosevkaEtoile = "0agg1gg3ymljln8msfask398w58p1wyy5bnzxc0pmmc7ivdajmh4"; - IosevkaSlab = "1rfzij1p3rybxrq461h3ykpq41hqrgaiwjd7x36dzm4bcm7mga9q"; - IosevkaSS01 = "0qhzmk8c0npisxqwn2qicxlad2awmnnvik91daidnndwhw4ylq8y"; - IosevkaSS02 = "15ipbca4c15vs7n62463asl58xshwsrqirhbp23gpr4ixmx2vrmy"; - IosevkaSS03 = "0nw7jx2smkn8aihcmwkmcqlzs0dhm54qmxrm9102vlsf61dawkpj"; - IosevkaSS04 = "1bk18a712xjngmv28fzkw6fs560k928b3ahp9w7cvq1xvji5g3qb"; - IosevkaSS05 = "1xgrbfg1am48j3ps7bnjryyy0pjnx6ahz75zaqwf35cwjb3f5wvf"; - IosevkaSS06 = "1wk1scyz34dc3dcq1af2c3nla1lh56zbgzx1xinf8qwypb6m01dw"; - IosevkaSS07 = "1z8gg8h2kbgq7d4lglfl4awbkmzxpjwcqa1xrxxpcpmxa04ppcfq"; - IosevkaSS08 = "1wid8y6wavxff7b62cxm00y93mjfc3zzjd76g4vgrb7r7ql9kd06"; - IosevkaSS09 = "06hwzhg4qb8cha7zl32pwzbcnzg1dv8432aq7hzfa0jq2jmvpxax"; - IosevkaSS10 = "1p8s2lfvr50pacs941gwxp211j4fn9rzxxvprz03swqklvwadir7"; - IosevkaSS11 = "15izq605ggr2lnc8lljk6lvwkdc87ilx53zw5j7cfdfq8bc6fv6k"; - IosevkaSS12 = "1xnbap1cm125pdg9x8dbc5lm691fr244k5vblj9mqhaqvbq9pqjs"; - IosevkaSS13 = "1l98yjgq4zbxnq5xwhlql9m864n2ha0d46xk0b5w32srnaq09ipb"; - IosevkaSS14 = "0rmd6gc624k3kls98wlz3v407xdq7cynjb06p9zhwxwfy3l9wpwl"; - IosevkaSS15 = "04qnx6lgp1g3vnwsgbxibjjia2fip1vhf5854kp9dx37qi8qzf7g"; - IosevkaSS16 = "13xx1s5gv1gly3pnc5rq6zx93rhllmga3k9ik3p86h3kd1valsvb"; - IosevkaSS17 = "00rc87a09j2v7f1s4spisqgrmlhf67gvvjy14dbmlv7s434z7ap2"; - IosevkaSS18 = "1fdpsqya1gn939v6b7iwj1sjpskbbxr5ypf0l5rvldxfqisx7zj4"; - SGr-Iosevka = "0raiapwifmf02560ibic8g47mal8w91wfdcivh8yh7g2ldf5hchr"; - SGr-IosevkaCurly = "1sg9prv501sa9iy9j4664qsp99d47lmfwn5hqms51kijliplfyfy"; - SGr-IosevkaCurlySlab = "1g216l92khl22w7833pmwaphvr94zjing3sx8ldnj4py26nvvfqp"; - SGr-IosevkaFixed = "0f0jk2fhqb4ch5gm6ndip04brchrz20kvs9ja4yarkmild3j1vmg"; - SGr-IosevkaFixedCurly = "10ayxf5v2yyclpb2gnd06jgkbqvqy0sq5n8vmkjmjb6fx5v0yl7f"; - SGr-IosevkaFixedCurlySlab = "14iyjj2i29bp084yi7ja1xxh3cl95xiyj29jcwgd6ndzv3xf8ir8"; - SGr-IosevkaFixedSlab = "0zvm0qy7bjlj9c3gqzip3ldg9lnm3003fdd1s4ks2zvaz6xwk9sy"; - SGr-IosevkaFixedSS01 = "09npaina3c9rsg84rlm1hadqd64v8i1rjcgbi6d8y5xs01dwn6jg"; - SGr-IosevkaFixedSS02 = "0r67l52pk1wlqdmfn2wbjkcd4szmpj4d24jcgy5b83gjr3hgmcr4"; - SGr-IosevkaFixedSS03 = "1dpj0hv1qghwhxqsymvk0xjhjnwxd9av23hr90bi5h10k7rx3nqy"; - SGr-IosevkaFixedSS04 = "1ffpj0g0jh72x12ibw6mrfkgh87jzhbz4ak15c0yh21rz3bya71a"; - SGr-IosevkaFixedSS05 = "1q6gw659p5fwgbqb20lzw89px8b0k2p65iasway0a4rihb7am18x"; - SGr-IosevkaFixedSS06 = "0axqqhlk0811yxnk34kq8a1ayl4cpykjqd7ma9z52y8a1kgdilx2"; - SGr-IosevkaFixedSS07 = "1jcwwp3w2j1chnn92r2whrq15ka3hfzw96w4ffppwk715s1kc63h"; - SGr-IosevkaFixedSS08 = "0f5xyr8dgbmgw21z9g12admbj4037lgid9agl6djiavljdn3xwlz"; - SGr-IosevkaFixedSS09 = "09xi1rrddivsqr2ddw3g10v2y4ybvbwa7p05jl7hz6kwgr1qrqwd"; - SGr-IosevkaFixedSS10 = "0m6qwkb7svjgskc391dri8vciydzjgx1s91bbsax8gy18mqh3vd7"; - SGr-IosevkaFixedSS11 = "1l04gmzdpccz1xmjqgn0jhpwxvq1axyqnrmkyafd116q4qszbayf"; - SGr-IosevkaFixedSS12 = "1i5jx8cffsl1zpjxvyb3m73r82vfh71z4s4dzg55svzh4lkkdfyc"; - SGr-IosevkaFixedSS13 = "013d0a2kli353vxlrrs5mgwdf1fipv3vsv626izp6whfxfg6pk6h"; - SGr-IosevkaFixedSS14 = "07n4hkrayr5chy46pa0d86srfaprm8kw56x86wndqj2blk5ydvh6"; - SGr-IosevkaFixedSS15 = "16lglz0ri7ww68whf8q009qq6kzaygy6lhbps5lmags34jhc9fa5"; - SGr-IosevkaFixedSS16 = "15j5b2w54bsq8mbi6swq6vd2xvvnnd0j0c3d4dcp4kbhr766841q"; - SGr-IosevkaFixedSS17 = "14j3miv97mk6hg3q7mafqc57m7z5sg6k7gap53v367793gkz6096"; - SGr-IosevkaFixedSS18 = "1iylhw0c05gdp48rx8417khs0yih0q917xx8k81bh5xdg0idyjim"; - SGr-IosevkaSlab = "1wyasyf0ydvh2q0akqvn7bzl66m7kyf2v9p3ry0lgcwv0flrwrpi"; - SGr-IosevkaSS01 = "1hs0pvamx149l2drvciqnwry75165sq2nvl7g0f4jazclfb4af3c"; - SGr-IosevkaSS02 = "05pl8asc5zqm1x4lcj00al27da1m301g96zyijsfxx2vybpw53jd"; - SGr-IosevkaSS03 = "0c60585ss53mzb0swf08r54673a426wq8mamxgnc733yinbsffwx"; - SGr-IosevkaSS04 = "0yml0y535kl2bid1qflkx3rrq2rq81nxpba18kk7xpscsg04ghjn"; - SGr-IosevkaSS05 = "03hxlchn96m0ll47rn8lg092c776b1v99pcrsmrlx3x8gslpdlka"; - SGr-IosevkaSS06 = "04cnymhvm5wi0hb956afi7029acqfqr0djhc1blhpkmldz8pzsn6"; - SGr-IosevkaSS07 = "1v4khps1z16k59snwxffwwn1y1yj2mp8k4fjkrxli7lb5mrn8lwl"; - SGr-IosevkaSS08 = "0pvy39fs5carcb0mh3ak8f5hkfjyk2pkmj7nfcaxdgkcgkys2ixn"; - SGr-IosevkaSS09 = "0cibn02752b2nfjgg12lb10hgigz3a4zcrsc76bh0r9dsgjphscn"; - SGr-IosevkaSS10 = "165snqk5livrkhpwcssb5b221f6gwwirm5rlsmx8d72y7rlc2vb0"; - SGr-IosevkaSS11 = "0czb0gxd2cq329123zcmz9axkfpza43kqhn6bi1rq8dgjh4qn0fx"; - SGr-IosevkaSS12 = "1ycqxpjm5k421a9iwiziab3j69frdgjiz7cwx1k7djqyshqn98k0"; - SGr-IosevkaSS13 = "18wiv124c868h7qaw6qvdy8xhgh4grfhqri8q2mi8zj5gadkh5yb"; - SGr-IosevkaSS14 = "1y2cfivf1zg03c2dn9xg5i29zmi4j3mj5diz3kyd68ih4csrzyla"; - SGr-IosevkaSS15 = "0ghg5f2ay6i2fzbw4xq28hcpbvwjzqvi1pz2nfvd2i2n61960xpr"; - SGr-IosevkaSS16 = "1132nf2xlsab8mhl5k1fvg8j9j6s1iy1avh5mj7jjb1z2i03z3fb"; - SGr-IosevkaSS17 = "155vfg5p114vdl722mqdfap3cm25wxydmhldd88n488yr3yviicv"; - SGr-IosevkaSS18 = "1y76pzsz5gfm0jjw8fa11aajf3zk188xr5fvsf3v89zdzk1ixzgj"; - SGr-IosevkaTerm = "0rkyy77cdcpf74kw59kbz3l7fs0xl2l0m2zwv8nl4i1x4dbxjj9x"; - SGr-IosevkaTermCurly = "09r4ag6madsc8889y1r12wk2763pjginrrykrj7w41j11bcvra39"; - SGr-IosevkaTermCurlySlab = "0bjm43znavfjni7bmi48g4j90v6fp7fg62h32wjvfcpldhycqw8m"; - SGr-IosevkaTermSlab = "0p4wvgp0nw70gdjn00dqh6vwwsl2fxcl11hf41s0hzr6cj8j0s93"; - SGr-IosevkaTermSS01 = "1m8n32qs5jlcbfvzjnhm9lafdc1vg2cjya3hb7sphgiiqqjdgkf1"; - SGr-IosevkaTermSS02 = "14fznvapw4pi3djhfr512pmmlb2air03jkik7d8rw8h69nnragb7"; - SGr-IosevkaTermSS03 = "14386dbd8yah6j74cp4pddp9cjwi175wg4mq62mi0pxkm1fla578"; - SGr-IosevkaTermSS04 = "038c4bkcfn8pd18dikipfbv7mqvils3v4fdrhyfmf83770qvkrf0"; - SGr-IosevkaTermSS05 = "10k49rgwiymbzys8sswfr5ryn1547i1hrg8phb71lbzwxhc4z5m3"; - SGr-IosevkaTermSS06 = "1pxyydwqbv1f51pdg36pvz5pj45nw28yc0vadj2q3617f2jb2n2h"; - SGr-IosevkaTermSS07 = "1p1aqqa5h4m6r97q00qf32myfli2fm7lg692aqw45baxxw8sn52l"; - SGr-IosevkaTermSS08 = "0r7hxaigz66cfgvci88hl0g55177kz3sbb8lji47h1v5r4xhzfl3"; - SGr-IosevkaTermSS09 = "1ah9kbw9zc0nzfnsyxkbv7wnlaaywyvlkmdv5bfi3ds06w2kjphk"; - SGr-IosevkaTermSS10 = "08b1l13g4j55sh10pfa6p7z72cvk4r694lml1m9vl4h4ail8w1ml"; - SGr-IosevkaTermSS11 = "1bqa6d95ga9309m2vr3xzyrhf92dhw3hd3n5awpxip2mfr2k1fbp"; - SGr-IosevkaTermSS12 = "00949ajl9xzpq7q045wb4hm8hfl94zpyp3fdjx0im7v4k2akzkjp"; - SGr-IosevkaTermSS13 = "1cdwxb3bykxkr3ifprmh4pwc33cbyrn26d2h1hix9xsjw5nw99c6"; - SGr-IosevkaTermSS14 = "1k0gwla5xkn8z70m36mhlhs7zm1sj7q33j68mb2wm783lapbll7v"; - SGr-IosevkaTermSS15 = "1gjac767vi97qs8hqdklzqqb75dz0yx0z9pjr2lribfv0dvxvhss"; - SGr-IosevkaTermSS16 = "0f738zydh51gvs68f0csax36bf2pi94pqbp0yjjqyrpx5c9m4pq0"; - SGr-IosevkaTermSS17 = "1rmdb0nbdy47q8v3b7mpb1df5x9yfv7ijs26xwv64aas75hjf8vk"; - SGr-IosevkaTermSS18 = "0jyidsr9aaccrc9bs7k8m5rj11p6vsxdrl2mslgc2bfwcarg89cm"; + Iosevka = "10vg87ifnx48vxmrcn0nz43lri10dzpgl24qfaj6vg1nwbywag3c"; + IosevkaAile = "1gym03y63x92vzisdy2x9sx3qbxvvpd70q6krlfp5zf7d3cph7fg"; + IosevkaCurly = "0bvdp99ybv0agx4n2qn78jsv8x8m86i44zvgp2h93lnji6dv67s7"; + IosevkaCurlySlab = "1mskl851z5wp3wwsxapbnq3gaarnmh4if0q6m7y3wb0c18s18f92"; + IosevkaEtoile = "10ccailwfmfjxzvk9lbns989dixqjbfdkw5j3fdkxvny07qviq54"; + IosevkaSlab = "0wnmm8hm4mis0pbqfma3qcd3rx08wgqi4f6ixg58vd9ds7a7rg8f"; + IosevkaSS01 = "19fhvx7r48mkzgadzpf1dh9w331cnjig70kyw8jzib9rlhca7y38"; + IosevkaSS02 = "0idwdmnfgq88l2rhlmlqkfbkrqhz35jqp902qc18sdwprwmj7kpz"; + IosevkaSS03 = "17scd42b67fylh5ws463793p3lakxhip8vfdk0z85z27x0yg97cc"; + IosevkaSS04 = "0p2bqkxnghkmvk84nb30vn3wl1ivfzb9s508hm0m3nzgj67mljf0"; + IosevkaSS05 = "0d6jfp83wcwx6v3rizss6z43kainv5zlrnsaya1m1n7qmpxgrj3p"; + IosevkaSS06 = "1b7s6ki4k0qqszznmsgf28vhqmx8vr3d1glbb87vqzgm59hfpcyk"; + IosevkaSS07 = "0hzf4byciw745gwzgr88pb5plaxrml5av4af84dw7qp1j4wzbamd"; + IosevkaSS08 = "0yismsjpgmb9s5rfvp4bz4dym48885pl7gf2mcv9dxwcly4wax5j"; + IosevkaSS09 = "1zcylrrs2q5w6160hd160ismmhjm835ki2j5r3axxzas9va6la4z"; + IosevkaSS10 = "0vh5nax33i0drw86vp2l13p5g13dfcc2py794spjda72pkdzvfiy"; + IosevkaSS11 = "12iw2vl0pz1bj2wnqjf9471rbg8bqrym56ziimdzknv5id033fbs"; + IosevkaSS12 = "017ipava1n37lyxd3a11rnabjjv28l975h1c2l2nramaqqa5pszx"; + IosevkaSS13 = "16mk6dc6rn362m1432fklllaqjadnlbdhl3faddlrf3mklwm1wlc"; + IosevkaSS14 = "0gzl2r4g3xn6y349wvr572s8cvc0cn7zyfp0s88pmnj632i5y0d9"; + IosevkaSS15 = "0rr15v2gyn01k4l4wq7w7fd3vqssnk03nf7zj4nf8f1az7dxskmh"; + IosevkaSS16 = "17l32p6yx888g4dgkbw8nj54d4a3b8rnqb5w2vaiickns851yh9c"; + IosevkaSS17 = "1rsrqbw1azwl0j0h88zlvsc0q0rlamw8j3kz910nsk3l4b8nicy4"; + IosevkaSS18 = "0l42b9zwm6xddf69lp1z273md3008a9gz8dnvf09ig6bmw1vp1rk"; + SGr-Iosevka = "0yda9880sg7jk5j1n36ji4w68l24s9prpaniya0jjyprylwfs7sh"; + SGr-IosevkaCurly = "1q2kmzjgxkhqwrai1zn3nhv0rf4xfi2f93j3w9zwlqc15v7ngn38"; + SGr-IosevkaCurlySlab = "1j170hxlk168hspnip9qvwjp44jb7i15swia8xy7ccb7jh6x28c8"; + SGr-IosevkaFixed = "1gmgwwa5rfqclncal5mir2iksirxzfjmfbcpn7qn4qhq9wms1j7x"; + SGr-IosevkaFixedCurly = "1ici7jgfzm4ivxvz6890r2ij3r686m9ikd0wy60bh13gp09h16dw"; + SGr-IosevkaFixedCurlySlab = "1cfkxcbdfaq0pk7ikdzqmkq1zwc542kzsc4rrns8sd9j2qzdi1bk"; + SGr-IosevkaFixedSlab = "0fvkcdfkzzc8dsx0cwcdk1l8qdaadnxdghkv6s8xdsj2q47dk20b"; + SGr-IosevkaFixedSS01 = "1j3v88j7a3r01a2q0g41k5w1dfy58igx2bvs0rlngvrhcyphdp4b"; + SGr-IosevkaFixedSS02 = "02sj966nsr9ck4kl77319lxikly96k83r27hxdyfhxmig7q4965l"; + SGr-IosevkaFixedSS03 = "1c50zshmg09g7z3zzdkdmj7slpvj59nl40k2dxwrldnyfvjpzxvb"; + SGr-IosevkaFixedSS04 = "03jb49rgx06wm13mb2b8gg6xpfj9nh8yh49ki8ybb4ivwmym3pfg"; + SGr-IosevkaFixedSS05 = "0ng7kmq8x4dllgbv7xnw0s5cnigm71q65vbszfdda6dzkgf0vhxz"; + SGr-IosevkaFixedSS06 = "021330rsnbnizxp36aaq4478vdi378vfypsan58k8cnl4nfsqygf"; + SGr-IosevkaFixedSS07 = "1b07d7srv6is7rx9f2hxd45jjg3yi07hr3xxqk0sssa0i8x79r85"; + SGr-IosevkaFixedSS08 = "00jihg0hks0aqqa4m6cgq7p5anpvhn1jr16rh4iycxc8m22wh90i"; + SGr-IosevkaFixedSS09 = "0m1j23wrgh56avcgl22lff4jqzhajcwwx7f56wh4kc173d1r8k9m"; + SGr-IosevkaFixedSS10 = "0g9g2bxl51y9rd3ag3vy0aslz3pw6f21mhpxyshcjl3558yqqly8"; + SGr-IosevkaFixedSS11 = "0h0wayawf7hf4vda5widcm92lfwrhb26kb258xs6w5vqc8vp3g96"; + SGr-IosevkaFixedSS12 = "0g6b0f6wsv0sgpdip2la44wxm3xxyxaq95vj9jiw43pdhrm2q5nz"; + SGr-IosevkaFixedSS13 = "0hzs4svcb8scnag1822vgx4fsrg684nl56wxgmlp6db5121p6xlx"; + SGr-IosevkaFixedSS14 = "09xlcsajfrwz2ji0klzp534vwp94wfawl2ixcc9x0whira867zbc"; + SGr-IosevkaFixedSS15 = "0pzjw32ffqsbw51msnr62b87hlqlpwz6nk98wy69dixx5jjqiv9c"; + SGr-IosevkaFixedSS16 = "04hcm1xb58qbsxf93qp18j4xk0x0ir1gmc1mz80xy38kvdn2l33h"; + SGr-IosevkaFixedSS17 = "0n8l3a5hmy907c1ysn8a6ada2v3wgb1pcv2bbdrzklcic0ww1zj8"; + SGr-IosevkaFixedSS18 = "0gjw1qk2ygxnd91vd107biarzrpfxpc3hflwa3aqpaga1qxc3f4p"; + SGr-IosevkaSlab = "18v5yayks1mnag9avgdslih8j9j8z9f4ygwjjs2mwwws547m9438"; + SGr-IosevkaSS01 = "188j0i31bzzyqzqly4hxbil5q9ccnv444285bv84vn9wivqgc44p"; + SGr-IosevkaSS02 = "052h4w9n8anfsjmh3q8i4aycg0qfx1l59wy7ag0fncl8r2ynw95m"; + SGr-IosevkaSS03 = "0d2xg6l63sp6yrb2vjh4wbb5jfw2ad8dm9f8hbigs5yqvb3762if"; + SGr-IosevkaSS04 = "0r08iay0i8z2hsp154j9grvyd3k2njjmad35q1h6yxmhawz63hzg"; + SGr-IosevkaSS05 = "0ds2cf96d9nbjhj5qj319a8pg162ia48rx2dk6kd019ijgciwcqf"; + SGr-IosevkaSS06 = "0a7vvplb39szmfj46fx1g5rql60my02akn37hrb228bcnrrhcskx"; + SGr-IosevkaSS07 = "1mar641pj2g9f9ap88j28zbmw7p015dahh35395720x7f7jk9y2b"; + SGr-IosevkaSS08 = "05y7ixzgngszkdrh1bv7idp0hwlrb4gn0sjl9m3hddd9rxs5bjqn"; + SGr-IosevkaSS09 = "1c83aiqqdcscgdih4m119jk6805j06jk6sn87dd81aybm0rdir13"; + SGr-IosevkaSS10 = "145d699f4s8z01fwdssmhcc60n6s84sd156yy17jgspazgp227mv"; + SGr-IosevkaSS11 = "0sqj7dbdk74ahxi17bdydqkyrdm3si2zr0q7fl8lj5v61x8kxg5g"; + SGr-IosevkaSS12 = "0l4ym9gr2d53hifhvf76r0w1s1rwxkniv9fgdb65saj6a2vd49f4"; + SGr-IosevkaSS13 = "03ygs3bj65mzyn9hyd663wc19a9jr6g11l9gdr8qn54v38g0brdb"; + SGr-IosevkaSS14 = "1pwwhnhjbswgyjmn54jnnz4vb4zvzc891vpd8lc029g0h80zm0j8"; + SGr-IosevkaSS15 = "0qa7m038d5vjrfxwmm9pvcs0r63ahqz1hxgv13bik4p2bifbq361"; + SGr-IosevkaSS16 = "12wpv1cjks0zxrv4a3fvsqzmwqk8rwrjxwc00dhl5rhgkk1mn51f"; + SGr-IosevkaSS17 = "04n13qlxiavzax85lrl5dr2a7wlqk1yjyl274hsjrw7cxghjjd30"; + SGr-IosevkaSS18 = "0ymh6vgs9gcsv2l7hx66gplq1x60hy582iwy33w3kp9nvinxm21k"; + SGr-IosevkaTerm = "17a1rv7awksy3fjs3m6qj365js4572wm1f0yy8qbkk0lv7bn1dd7"; + SGr-IosevkaTermCurly = "1cdm79fbb21jl4bdw2im961cfskf104gzkv9riliw1b7vkrfxl1n"; + SGr-IosevkaTermCurlySlab = "0ykn3d72az3sgn35vr2vf5d70l10spmhli05s7sk68y669g0z5jb"; + SGr-IosevkaTermSlab = "0sxzcpnh8xykk09kk3sdm0pxqmr48cc0k8cyx0s94adwr9hg4dl7"; + SGr-IosevkaTermSS01 = "1rr9i5hq2zz66abdavpwg4mpbhf5wl463bdy7xnjnqpbpj766f90"; + SGr-IosevkaTermSS02 = "1nzadff8ml61z3fa2b0hrla0dz02hjk68p0byzahn5hr9cgc1v4j"; + SGr-IosevkaTermSS03 = "0f8axrzy8skxzsnfkb16vbbjww152npqhd7y73vzcqn8r90ngs53"; + SGr-IosevkaTermSS04 = "1i37y1nsfhm27vga6d7av5986qyvwscnmlbrskdrbrhl7sg12yb2"; + SGr-IosevkaTermSS05 = "0i3aidf3p5dqlpkrz595nxr6ljj94nzwg7cmdmy3c6685050bk35"; + SGr-IosevkaTermSS06 = "08jdfpa9sm0vwrz7vgz5rib2wj26jdp9lry9gj4g3iins6f41vwq"; + SGr-IosevkaTermSS07 = "1gjp6yfq6licmhkqf5ag8ldynjxfa7lbaad10cv56frqkkg85v4c"; + SGr-IosevkaTermSS08 = "1w8vxwxvpadf82sv7p56hc75lllp09ygm2k5rw6s5iyx580w4m6h"; + SGr-IosevkaTermSS09 = "1d1jvgd5wy1bwlmd0gqdjpqz4611dr27gf6kh8i65q24sbjk4mw8"; + SGr-IosevkaTermSS10 = "07r63vr3yqfssqkc8icj7qyrk80i9jnx295i254ianknbmjd8991"; + SGr-IosevkaTermSS11 = "1vqpsl0yk3cgrc40rf0mm4v9q30c6y5c858g7piibcj3bp2adi8z"; + SGr-IosevkaTermSS12 = "1i4ngsxwj82hz4vqla1pr3i7xkhnq872k0f91pvbz63fyi8ij7sy"; + SGr-IosevkaTermSS13 = "1pf36mlndldl01jgbza5jjlf12mqxqwzr7j3zx4vp587yjf6iqap"; + SGr-IosevkaTermSS14 = "1nv3gdpfdwc2pci130kj1n2890b1lnbczgw826cdpp3w7spxs04f"; + SGr-IosevkaTermSS15 = "1xj9q80v0n65nn7zxnckdmc23bb3458v6pv8f36ynj3icbb645zj"; + SGr-IosevkaTermSS16 = "0gxk5bfaq1g7is8n7l60iv6hhygx4i3b9j8zxq5svybhmg4malnk"; + SGr-IosevkaTermSS17 = "00kvld6l6mzp5bbygwq4sy3f262jb295kyk8nq9gwvamg92md7hc"; + SGr-IosevkaTermSS18 = "0dzzfc8y7wgz727z3p5zdd5g25y6h1d5y1aflnz4r2grg5rv6kvp"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 748c043ad6..a608a53e42 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.055"; + version = "0.056"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-bE7XjVzleSo5hjc7Azcl8R4OgJzsj1U21UOuXrBkulA="; + hash = "sha256-RaohSyTWHbhJXW6pRaLX20UAMA0uIJ4LWtq2MSQmnGU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index d603364335..898e016c65 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240614093027"; + version = "20240624143214"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-IWBih6SyS9rpf6qiQmQSXKsiQeVoBMO9PfB0ZT1FV9c="; + hash = "sha256-VaETDDfDrnniMLgm2Z2/SUdIeWfQlJYygpF6Kx++whw="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix index 479a0c29b5..fa2785a8db 100644 --- a/third_party/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/andromeda-gtk-theme/default.nix @@ -2,22 +2,22 @@ stdenvNoCC.mkDerivation { pname = "andromeda-gtk-theme"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-06-24"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = "Andromeda-gtk"; - rev = "8efb8ffef7118adf7a22d34a287594499d62b9b8"; - hash = "sha256-AlPSD6tPNYY8iqPFS5IVOO5Zd3UqR3uS5h4l48UZ+dw="; + rev = "1d86d5cab146a1841bfe2e5c4f0a109b315cfd98"; + hash = "sha256-YzmNo7WZjF/BLKgT2wJXk0ms8bb5AydFcfPzFmRrhkU="; name = "Andromeda"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "Andromeda-gtk"; - rev = "b8c1a8bd0ba8d3e35dcd43f3fc3c177844b02c9c"; - hash = "sha256-51IWJtbAHA8jNbrGbudiwqQ9SC4dpj9CTHqovNWOtc8="; + rev = "7b0f5508269695054306eec10bd56ef5598ddf4a"; + hash = "sha256-Bi5G3zs1bFYbOf74864eZHPUIJvBbByQNtDfqkNUSxo="; name = "Andromeda-standard-buttons"; }) ]; @@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/EliverLara/Andromeda-gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ jakedevs ]; + maintainers = with maintainers; [ jakedevs romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix b/third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix index b910ba8c6c..b8b7da4021 100644 --- a/third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/base16-schemes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "unstable-2024-01-14"; + version = "unstable-2024-06-21"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "schemes"; - rev = "395074124283df993571f2abb9c713f413b76e6e"; - sha256 = "sha256-9LmwYbtTxNFiP+osqRUbOXghJXpYvyvAwBwW80JMO7s="; + rev = "ef9a4c3c384624694608adebf0993d7a3bed3cf2"; + sha256 = "sha256-9i9IjZcjvinb/214x5YShUDBZBC2189HYs26uGy/Hck="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 59ba5a80b3..e75376dea7 100644 --- a/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-pmUuYD0RPyF5I2p5MBErziehBrfc5MswQVvfwl4ozg8="; + hash = "sha256-xzs5eTNOO27//vfkax4cpKO3xnsjavSNU6tyt8H/dF0="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix index e00fe5ff22..19ff7c18b8 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "17.0"; + version = "20.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-lNHzO5wxAFL1axLlxefXyJue0Zu6bM53AUNm74IE4y8="; + sha256 = "sha256-rEwSlLnDzW6iaPCf91mhL0PqycJAqm/ZmoRf35fl1RY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index a16cf43cfe..9b279bba3a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,15 +8,15 @@ , gitUpdater }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "marwaita"; - version = "17"; + version = "20.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE="; + hash = "sha256-3kVfZnqRJs0CPl+EICDjg2+NSwuz18QccHx63cVLpFY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix index 13d352c6b3..e7c4648e55 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -1,79 +1,79 @@ { lib , stdenvNoCC , fetchFromGitHub -, gtk-engine-murrine , breeze-icons +, gtk-engine-murrine +, jdupes , plasma-framework , plasma-workspace -, jdupes }: stdenvNoCC.mkDerivation rec { pname = "nordic"; - version = "2.2.0-unstable-2024-05-24"; + version = "2.2.0-unstable-2024-06-25"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2f6b72b7b6d7112bb147a5adeca307631dd698cb"; - hash = "sha256-4GNEJTAS6EAPYyaNOZS1lGu67nobGmMOHoq8I5WaPcA="; + rev = "8f7bcdb597778b7233c97423f19c936e6c5d4abf"; + hash = "sha256-fNPrBpdJS164DezKEnLixGUQxCW5RQ97Oj6BNI3Dr34="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "d92b503cdabb4cf263de4c3fd9afba889c65aad1"; - hash = "sha256-foCWcKNdk9S1MijJOuw8jFV4gnDSNWmTjgSCU9GefzE="; + rev = "ae071e635055e8401e120d652602a183110bb91d"; + hash = "sha256-YOfy2TNxq5FKB311C9t26WtrWefSdVdMNAq458BO5bQ="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b76c48252c9dc6171cccf63c0c412b9afe7fa89c"; - hash = "sha256-q/duyEin377J1cxD5+uXlEbPN/S27ht2es/02wKoiEY="; + rev = "07e62d14347ae233a857ed77b72d8c8e7a108a6e"; + hash = "sha256-7S+d9oQjewtVgIlr8OxCNU0OdZyoPNELtV6LtMhkoQ8="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b8b16b451bf5fcfada98a92682a6ff97d93fc36f"; - hash = "sha256-959P2xdpCLhNRedoakMiHXzj+H4SWX1Lb9w6yYRzGds="; + rev = "3a7a56656a50d65e85bea58c649088a5aaa30690"; + hash = "sha256-WYaFsGqBNf5K5uAqnC8I5o7NC7MRNqGFJ0hLkB24RxU="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "c45681eca7fce4c129063a0aae727d42b570fcfd"; - hash = "sha256-8a4pMkyGt+WIVXLSsLKbxCP9i4RdZKX5lvwZB+BemSY="; + rev = "db4fd3af7e2af0ff962296b2881a94b14fa73e66"; + hash = "sha256-U6o99D62H2BIvUV/xHc+wtbIFDdxxPxQWu5/f8NWhQ0="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b07b6450ff2389f88ef5ad980a1ead47071b1d63"; - hash = "sha256-+o46apK051UH6GbG/ugSgxI212MWEnYaVlDK9rWqPMU="; + rev = "f75e18799b804d17b97eead583548b9415faddb6"; + hash = "sha256-O0vad/gWUQ2B/2hz2uoSyRa1gM6N3ZbtOLyDJTNhIQo="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "bc3e7554ab8e8d94e978691054b1b062696eb688"; - hash = "sha256-tJX/oTEp/9pmzrINBWrnhS9n8JR40T1C0A4LhRLWU9A="; + rev = "9f109cad906cb47c188557b8f3d324dad394a008"; + hash = "sha256-+buFwFhk10qwsfS6DwUQzE0/F67BcoS+zXGk8wKn1Bc="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "26b44080c2dbd1a9b576a24d1b14ae01b98519d0"; - hash = "sha256-5gGiBL7ZKFSPZtnikfrdvrWKG9RkIHdPyWdHYnmSTvg="; + rev = "60f63d9d54d93bda0529b8a6fae32427d00ae73c"; + hash = "sha256-565iCxMX5Jms+nN0nRFp25YJ/sfKt13sAoIrEgoXGtg="; name = "Nordic-Polar-standard-buttons"; }) ]; @@ -151,11 +151,11 @@ stdenvNoCC.mkDerivation rec { >> $sddm/nix-support/propagated-user-env-packages ''; - meta = with lib; { + meta = { description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix index b3f914ae97..635548c887 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix @@ -4,18 +4,18 @@ , kdeclarative , plasma-framework , plasma-workspace -, gitUpdater +, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "unstable-2023-10-20"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "1cfe8da54e6f76d5ce0d2234dcb4f5186431edb3"; - hash = "sha256-Ts8cS7dH8RkfRgWvzDKLCC2G6Hsnvx0NAGstfxMIt+Y="; + rev = "5224dbdeed76c5ed4b7b5ff6d0b48ebe82547228"; + hash = "sha256-qS0bVfweSXv2Sox3cXQ8PfcPD+WA6kwrEoS0ijxWZE8="; }; # Propagate sddm theme dependencies to user env otherwise sddm does @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Flat Design theme for KDE Plasma desktop"; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 35a7a2247f..a2592cb39a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,7 +9,6 @@ , cjs , evolution-data-server , fetchFromGitHub -, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -72,25 +71,18 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.4"; + version = "6.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-I0GJv2lcl5JlKPIiWoKMXTf4OLkznS5MpiOIvZ76bJQ="; + hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - # Switch to GNOME Online Accounts GTK - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch"; - includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ]; - hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8="; - }) ]; buildInputs = [ @@ -160,16 +152,18 @@ stdenv.mkDerivation rec { {} + pushd ./files/usr/share/cinnamon/cinnamon-settings - substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' - substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" - substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ - --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ - --replace "msgfmt" "${gettext}/bin/msgfmt" - substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" - substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" + substituteInPlace ./bin/capi.py --replace-fail '"/usr/lib"' '"${cinnamon-control-center}/lib"' + substituteInPlace ./bin/SettingsWidgets.py --replace-fail "/usr/share/sounds" "/run/current-system/sw/share/sounds" + substituteInPlace ./bin/Spices.py --replace-fail "subprocess.run(['/usr/bin/" "subprocess.run(['" \ + --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ + --replace-fail "msgfmt" "${gettext}/bin/msgfmt" + substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_keyboard.py --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command" + substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd - sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} + substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ + --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" patchShebangs src/data-to-c.pl ''; @@ -177,17 +171,6 @@ stdenv.mkDerivation rec { postInstall = '' # Use locales from cinnamon-translations. ln -s ${cinnamon-translations}/share/locale $out/share/locale - - # Do not install online accounts module, with a -Donlineaccounts=false c-c-c - # this just shows an empty page. - rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py - - # g-o-a-gtk already provides its own desktop item. - rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop - - # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. - # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 - rm -r $out/share/cinnamon/styles.d ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 55ca24d57d..b5a98a9090 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-AYnI+k6CzpWUutusCSDR5KhOmv5FWoChotAbCJXTh4I="; + hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI="; }; buildInputs = [ @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" - # https://github.com/linuxmint/cinnamon-control-center/issues/326 - "-Donlineaccounts=false" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 830abafa28..9bb7b706f0 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY="; + hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index e184e64a88..62066ff8da 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI="; + hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f08a242d46..f67ba3a2b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.3"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ncYE2dCIAQxCMCe/5zrDU9iHTIkw+iO/IQl8+pfTvLI="; + hash = "sha256-hXgDTQnOlskzyOogvk7BQ9iJ3oXRtgUUX5bXtgD+gFo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch index 1b56b3903f..368e49bb84 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch @@ -16,10 +16,10 @@ index d8428dc..1f15115 100644 ] +dbus_glib = dependency('dbus-glib-1') - executable('cinnamon-session', + executable('cinnamon-session-binary', cinnamon_session_sources, dependencies: [ -@@ -74,7 +75,7 @@ executable('cinnamon-session', +@@ -74,7 +75,7 @@ executable('cinnamon-session-binary', xext, xrender, xtest, diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch deleted file mode 100644 index 6c44f93d8f..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 23 Dec 2023 23:24:59 +0800 -Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login - shell - -Users expect their shell profiles to get sourced at startup, which -doesn't happen with wayland sessions. - -This commit brings back that feature, by making the cinnamon-session -wrapper script run a login shell. - -ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 ---- - cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ - cinnamon-session/meson.build | 14 +++++++++++++- - 2 files changed, 29 insertions(+), 1 deletion(-) - create mode 100755 cinnamon-session/cinnamon-session.in - -diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in -new file mode 100755 -index 0000000..d9d7cb2 ---- /dev/null -+++ b/cinnamon-session/cinnamon-session.in -@@ -0,0 +1,16 @@ -+#!/bin/sh -+ -+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && -+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && -+ [ -n "$SHELL" ] && -+ grep -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | grep -q "false") && -+ ! (echo "$SHELL" | grep -q "nologin"); then -+ if [ "$1" != '-l' ]; then -+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" -+ else -+ shift -+ fi -+fi -+ -+exec @libexecdir@/cinnamon-session-binary "$@" -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index 10092ee..3d32fdc 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -54,7 +54,7 @@ cinnamon_session_sources = [ - ] - - dbus_glib = dependency('dbus-glib-1') --executable('cinnamon-session', -+executable('cinnamon-session-binary', - cinnamon_session_sources, - dependencies: [ - cinnamon_desktop, -@@ -76,6 +76,18 @@ executable('cinnamon-session', - ], - include_directories: [ rootInclude ], - install: true, -+ install_dir: get_option('libexecdir'), -+) -+ -+script_conf = configuration_data() -+script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) -+ -+configure_file( -+ input: 'cinnamon-session.in', -+ output: 'cinnamon-session', -+ install: true, -+ install_dir: get_option('bindir'), -+ configuration: script_conf - ) - - units = [ --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 47cedfa0a6..a7262b2f93 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,18 +32,17 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.0.4"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-GtaoqzcnpKbiP4OqhnLkNWzZTUqX/KgVE6JImNMkdGo="; + hash = "sha256-2KQJNUc/uvbXnqqV0Yt3cltTHNbCo+wK67NXlid02Sk="; }; patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch - ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 115ffcdece..b704f21e29 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-bT6NetCBo3J9IiiJ9Hs4iC1N3n/AP9Q+6wZciuKA4i4="; + hash = "sha256-OAG5Tes+0bi+vKqm77Y7OykTpUkMdRaXIJYLuomIDMo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 0c7f018752..4854cf671b 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.0.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kLZ0niamPV5Kaq6ZBTp1SMAl6dKMkcC+rodtAoH5+Go="; + hash = "sha256-U/3+njVctLbu+n/HQ+YuGdGhNN7eWU5u9OEFOz4T69o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index 4ff139ba78..bb7ab672db 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -6,8 +6,10 @@ , cairo , glib , readline -, spidermonkey_102 +, libsysprof-capture +, spidermonkey_115 , meson +, mesonEmulatorHook , dbus , ninja , which @@ -16,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; + hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg="; }; outputs = [ "out" "dev" ]; @@ -33,21 +35,24 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ cairo readline - spidermonkey_102 - dbus # for dbus-run-session + libsysprof-capture + spidermonkey_115 ]; propagatedBuildInputs = [ glib ]; - mesonFlags = [ + mesonFlags = lib.optionals stdenv.hostPlatform.isMusl [ "-Dprofiler=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index d0feadedbf..9870ed046d 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "18102c72ba072cd83ccee69e9051e87e93cab01a"; - sha256 = "sha256-o2+KfHwPvoqDMBa9C/Sm/grDf0GWcjx2OtT4rhnCk5Q="; + rev = "35aa5b9839935fc3415ba6b7c77171459e7325fa"; + sha256 = "sha256-2ItjQ3CO1kG2QdAEqNxlrZ1AOfHmUBCE99kLalU7AUc="; }; nativeBuildInputs = [ @@ -41,12 +41,9 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - preFixup = '' - # For Gdk.cairo_surface_create_from_pixbuf() - # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' - buildPythonPath ${python3.pkgs.pycairo} - patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py - ''; + # For Gdk.cairo_surface_create_from_pixbuf() + # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pycairo ]; meta = with lib; { homepage = "https://github.com/linuxmint/folder-color-switcher"; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix index ef2c6ec4fa..b4b3d91ffc 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240629131305/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; + hash = "sha256-NaInP600QQ9sNRaJgM9SNyawZz1H8gwiuZ4lf8KJnIk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 1fa0dd7424..6a3956e53c 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -9,13 +9,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = version; - hash = "sha256-nVdx+d+KpTh9EPLhW0+FFzq3OEyacDSxHgllMm51BKk="; + # https://github.com/linuxmint/mint-l-icons/issues/11 + rev = "f5edf5683c7e7e51da2c0e66a9a288d5342edc63"; + hash = "sha256-MKrynS9W5kHRwCKwkXMsUx43KIhtGMaYYWhb/j+vDpk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-theme/default.nix index 7d5b84dd8c..214ebb9997 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,14 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.6"; + version = "1.9.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # They don't really do tags, this is just a named commit. - rev = "1444bacf3ff470db05b663b9c5c3a3419decba60"; - hash = "sha256-n+5PMfNUNJrVSvCXiFdiRQrq6A6WPINcT110J8OV6FQ="; + rev = version; + hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix index 59d1fb1425..13db58183c 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -2,25 +2,23 @@ , lib , stdenvNoCC , python3 -, sassc -, sass +, python3Packages }: stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.6"; + version = "2.1.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Acf9cwTKDUF1WwIqT3BR8wFpfUNRyZ+8anOIIg3O3CQ="; + hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; }; nativeBuildInputs = [ python3 - sassc - sass + python3Packages.libsass ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index 08a9d3bf91..dcf63149e0 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.1"; + version = "6.2.0"; outputs = [ "out" "dev" "man" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; + hash = "sha256-k8hUYA4/OzL2TB8s5DJpa2nFXV2U9eY09TLkqBDq9WE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix index 8b6f5f07a1..f2a872b71e 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix @@ -8,7 +8,6 @@ , gtk3 , nemo , python3 -, substituteAll }: let @@ -25,11 +24,8 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch - # Required for pygobject_init (). - (substituteAll { - src = ./python-path.patch; - env = "${python3.pkgs.pygobject3}/${python3.sitePackages}"; - }) + # Pick up all passthru.nemoPythonExtensionDeps via nemo-with-extensions wrapper + ./python-path.patch ]; nativeBuildInputs = [ @@ -54,6 +50,8 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pygobject3 ]; + meta = with lib; { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-python"; description = "Python bindings for the Nemo extension library"; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch index bf6db93385..62a6a70430 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch @@ -7,7 +7,7 @@ index 8d2acdb..ee24143 100644 debug("Sanitize the python search path"); - PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]"); -+ PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]; sys.path.append('@env@')"); ++ PyRun_SimpleString("import sys; import os; sys.path = [path for path in sys.path if path]; sys.path += os.getenv(\"NEMO_PYTHON_SEARCH_PATH\").split(os.pathsep)"); if (PyErr_Occurred()) { PyErr_Print(); diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index a5ab9dfe9b..3629b84b4a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix @@ -4,12 +4,12 @@ rec { # When you bump this, you should make sure all nemo-extensions # are actually using this file since we try to deal with tags # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; + sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index fbc12c13dc..6a91217680 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -13,6 +13,8 @@ , cinnamon-desktop , xapp , libexif +, json-glib +, gtk-layer-shell , exempi , intltool , shared-mime-info @@ -22,13 +24,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; + sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc="; }; patches = [ @@ -49,6 +51,8 @@ stdenv.mkDerivation rec { exempi gvfs libgsf + json-glib + gtk-layer-shell ]; nativeBuildInputs = [ @@ -64,6 +68,8 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" + # enabled by default in Mint packaging (see debian/rules) + "-Dgtk_layer_shell=true" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/wrapper.nix index 604247566b..0c9cba5537 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/wrapper.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/wrapper.nix @@ -3,12 +3,14 @@ , makeWrapper , nemo , nemoExtensions +, python3 , extensions ? [ ] , useDefaultExtensions ? true }: let selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); + nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions; in symlinkJoin { name = "nemo-with-extensions-${nemo.version}"; @@ -21,7 +23,8 @@ symlinkJoin { for f in $(find $out/bin/ $out/libexec/ -type l -not -path "*/.*"); do wrapProgram "$f" \ --set "NEMO_EXTENSION_DIR" "$out/${nemo.extensiondir}" \ - --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" + --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" \ + --set "NEMO_PYTHON_SEARCH_PATH" "${python3.pkgs.makePythonPath nemoPythonExtensionsDeps}" done # Don't populate the same nemo actions twice when having this globally installed diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix index fc0fd4eab8..2a1f4cab4a 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "deepin-shortcut-viewer"; - version = "5.0.7"; + version = "5.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-r/ZhA9yiPnJNTrBkVOvaTqfRvGO/NTod5tiQCquG5Gw="; + sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix index a8c94910cc..32109c4b6c 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "deepin-desktop-theme"; - version = "1.0.9"; + version = "1.0.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-rhbxqKT9yrtW4JJ8jCUSpsIh0JeEIttkS414vBhD9vs="; + hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 5260df0ece..59d82477b1 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "deepin-icon-theme"; - version = "2024.01.31"; + version = "2024.04.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc="; + hash = "sha256-IUiKGHsFGJawWnwfckS8ZeB2WOxDyDlre4oekJuCKcc="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-application-manager/default.nix index b386d0bbea..bb4a2c299a 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -1,45 +1,32 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config -, wrapQtAppsHook -, qtbase +, qt6Packages +, dtk6core }: stdenv.mkDerivation rec { pname = "dde-application-manager"; - version = "1.1.8"; + version = "1.2.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U="; + hash = "sha256-nyT5bp37gOWKbpPBmLULJmeL9oZyBwIC5vYwPyBLcAc="; }; - patches = [ - (fetchpatch { - name = "set-more-scale-envs-to-application.patch"; - url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch"; - hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w="; - }) - (fetchpatch { - name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch"; - url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch"; - hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6Packages.qtbase + dtk6core ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix index b244898566..59c09cea1b 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.12.1"; + version = "5.13.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI="; + hash = "sha256-Hn759Cxtzv+HBllA2vdZcH6P8EWZkjawpgkmLiE2+uA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-clipboard/default.nix index 78f2fd0da6..efa6faf080 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-clipboard/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dde-clipboard"; - version = "6.0.7"; + version = "6.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-6CbCor0vgVMsMt8KY2uWrNqOsBEIaz7s2nViiHz+m1g="; + hash = "sha256-9sBAurO3v/9HOc5k1RrtdNHusImTHLklpxetLMuQuW4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix index ffb94b9b52..2f6a8afb9d 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.44"; + version = "6.0.55"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0="; + hash = "sha256-dCUtCS7Vmd7LX34JA70P3dgsmSdRefgO//NERhKlRlE="; }; postPatch = '' @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { gtest ]; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + cmakeFlags = [ "-DCVERSION=${version}" "-DDISABLE_AUTHENTICATION=YES" diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 42d371628b..cfc6104209 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.40"; + version = "6.0.51"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA="; + hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q="; }; nativeBuildInputs = [ @@ -69,25 +69,25 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ - --replace "/usr/bin/deepin-compressor" "deepin-compressor" + --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \ - --replace "/usr/bin/mountavfs" "mountavfs" \ - --replace "/usr/bin/umountavfs" "umountavfs" + --replace-fail "/usr/bin/mountavfs" "mountavfs" \ + --replace-fail "/usr/bin/umountavfs" "umountavfs" substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \ - --replace "/usr/bin/dde-file-manager" "dde-file-manager" \ - --replace "/usr/bin/dde-desktop" "dde-desktop" + --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \ + --replace-fail "/usr/bin/dde-desktop" "dde-desktop" substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \ src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" + --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \; ''; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix new file mode 100644 index 0000000000..8b653004f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, dtkwidget +, dde-qt-dbus-factory +, dde-dock +, deepin-pdfium +, qt5integration +, qt5platform-plugins +, taglib +, ffmpeg +, ffmpegthumbnailer +, pcre +, dbus +}: + +stdenv.mkDerivation rec { + pname = "dde-grand-search"; + version = "5.4.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-dock + dde-qt-dbus-factory + deepin-pdfium + qt5integration + qt5platform-plugins + taglib + ffmpeg + ffmpegthumbnailer + pcre + ]; + + 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 = '' + # fix access permit to daemon + substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \ + --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped" + + for file in $(grep -rl "/usr/bin/dde-grand-search"); do + substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search" + done + + substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service + ''; + + cmakeFlags = [ + "-DVERSION=${version}" + "-DNIX_DEEPIN_VERSION=23" + ]; + + meta = { + description = "System-wide desktop search for DDE"; + homepage = "https://github.com/linuxdeepin/dde-grand-search"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff new file mode 100644 index 0000000000..dd036bf6ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff @@ -0,0 +1,9 @@ +diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service +index 14823cb..33dd51e 100644 +--- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service ++++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=com.deepin.dde.daemon.GrandSearch +-Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop ++Exec=@out@/bin/dde-grand-search-daemon diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff new file mode 100644 index 0000000000..bcb9f2b6c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff @@ -0,0 +1,13 @@ +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/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index c1a26e100a..5003129c1e 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -3,7 +3,7 @@ , runCommand , glib , gtk3 -, dde-dock +, dde-grand-search , startdde , dde-session-shell , dde-file-manager @@ -17,7 +17,7 @@ let gsettingsOverridePackages = [ - dde-dock + dde-grand-search startdde dde-session-shell dde-file-manager diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix index f531418750..7544bc5751 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -2,57 +2,48 @@ , lib , fetchFromGitHub , cmake -, qttools , pkg-config -, wrapQtAppsHook -, dtkwidget -, dtkdeclarative -, qtbase -, appstream-qt -, kitemmodels -, qt5integration +, qt6Packages +, qt6integration +, qt6platform-plugins +, dtk6declarative +, dde-shell }: stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.4.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY="; + hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM="; }; - postPatch = '' - substituteInPlace desktopintegration.cpp \ - --replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h" - ''; - nativeBuildInputs = [ cmake - qttools pkg-config - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - dtkwidget - dtkdeclarative + qt6integration + qt6platform-plugins + dtk6declarative + dde-shell + ] ++ (with qt6Packages; [ qtbase + qtsvg + qtwayland appstream-qt - kitemmodels - ]; + ]); cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix index f9d97f735a..58c7f30f14 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.21"; + version = "2.0.26"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw="; + hash = "sha256-eicwutePtKPY5DmNmIFSTQkdrE/i2RKfu766lQWy+iY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix index f3f93be7f3..2e6bd31a93 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-polkit-agent"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-NSMwNL4ttCaqo0h0sF11bOJ20FhOB+SG27K4k8F4O/o="; + hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix index cfaa12338e..a9c283c6ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "dde-session-shell"; - version = "6.0.17"; + version = "6.0.20"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA="; + hash = "sha256-RPVGjCg7U0nWxqesoSNDtEzh/+OYDSsX31YU+LLllVM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-ui/default.nix index 190ad0bbc7..478214bc19 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dde-session-ui"; - version = "6.0.16"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0="; + hash = "sha256-elDtY7fZf2I8ngEmMB9sRRhm78nEDf5ag6jny7UDG70="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session/default.nix index 0e919c144d..9b1b493840 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-session"; - version = "1.2.5"; + version = "1.2.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E="; + hash = "sha256-nLoSVsPyrNA996H7C8N77aiheaiLs3Sd7ZVuxiuNLE4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix new file mode 100644 index 0000000000..8a66181c2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, pkg-config +, wrapQtAppsHook +, wayland-scanner +, dtk6declarative +, dtk6widget +, dde-qt-dbus-factory +, qt6Packages +, qt6integration +, qt6platform-plugins +, kdePackages +, wayland +, wayland-protocols +, yaml-cpp +, xorg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dde-shell"; + version = "0.0.23-unstable-2024-06-11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-shell"; + rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3"; + hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw="; + }; + + 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" + done + + for file in $(grep -rl "/usr/lib/deepin-daemon"); do + substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + done + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + qt6Packages.wrapQtAppsHook + qt6Packages.qttools + wayland-scanner + ]; + + buildInputs = [ + dtk6declarative + dtk6widget + dde-qt-dbus-factory + qt6Packages.qtbase + qt6Packages.qtwayland + qt6Packages.qtsvg + qt6platform-plugins + kdePackages.networkmanager-qt + wayland + wayland-protocols + yaml-cpp + xorg.libXcursor + xorg.libXres + ]; + + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + 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}" + "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" + "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" + ]; + + meta = { + description = "A plugin system that integrates plugins developed on DDE"; + homepage = "https://github.com/linuxdeepin/dde-shell"; + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rewine ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff new file mode 100644 index 0000000000..0e1107abc7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff @@ -0,0 +1,18 @@ +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/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff new file mode 100644 index 0000000000..cc334a3220 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff @@ -0,0 +1,17 @@ +diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in +index e28cc2f..3875769 100644 +--- a/misc/DDEShellConfig.cmake.in ++++ b/misc/DDEShellConfig.cmake.in +@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui) + find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED) + + include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake) +-set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@) +-set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@) +-set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@) ++set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) ++set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell) ++set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) + check_required_components(Dtk@DTK_VERSION_MAJOR@Core) + + include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake") diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff new file mode 100644 index 0000000000..cdfad41540 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff @@ -0,0 +1,26 @@ +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/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-widgets/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-widgets/default.nix index f7455a92e0..786f6dab52 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-widgets/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "dde-widgets"; - version = "6.0.19"; + version = "6.0.22"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU="; + hash = "sha256-rE/7AoTID9UWxAS+LVYY5WYDNAo8GnSJmUrJFn3l+1M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/deepin-kwin/default.nix index a46088a63d..507b234605 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "deepin-kwin"; - version = "5.25.17"; + version = "5.25.26"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-Zi6SNNiwty16b3cCMK52zrXqglq8TqK2x8smSD504+o="; + hash = "sha256-xBCJu89OV+JMGsd/txAqj2Kce91mnOsRK31WGz7qS40="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix index febfa41711..82c183ca00 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix @@ -9,7 +9,6 @@ , dde-polkit-agent , qt5integration , libsecret -, libgnome-keyring }: stdenv.mkDerivation rec { @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { dtkwidget dde-polkit-agent qt5integration - libgnome-keyring libsecret ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index 4b2dc27c11..6c4f7a3b20 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, libsForQt5, qt6Packages }: +{ lib, pkgs, config, libsForQt5 }: let packages = self: let @@ -28,12 +28,14 @@ let dtk6widget = callPackage ./library/dtk6widget { }; dtk6declarative = callPackage ./library/dtk6declarative { }; dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; + qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; + qt6integration = callPackage ./library/qt6integration { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; dde-appearance = callPackage ./core/dde-appearance { }; dde-app-services = callPackage ./core/dde-app-services { }; - dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { }; + dde-application-manager = callPackage ./core/dde-application-manager { }; dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; @@ -49,6 +51,8 @@ let dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; dde-widgets = callPackage ./core/dde-widgets { }; + dde-shell = callPackage ./core/dde-shell { }; + dde-grand-search = callPackage ./core/dde-grand-search { }; #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; @@ -71,9 +75,6 @@ let deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages - go-lib = callPackage ./go-package/go-lib { }; - go-gir-generator = callPackage ./go-package/go-gir-generator { }; - go-dbus-factory = callPackage ./go-package/go-dbus-factory { }; dde-api = callPackage ./go-package/dde-api { }; dde-daemon = callPackage ./go-package/dde-daemon { }; deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; @@ -83,6 +84,7 @@ let #### TOOLS dde-device-formatter = callPackage ./tools/dde-device-formatter { }; deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + deepin-anything = callPackage ./tools/deepin-anything { }; #### ARTWORK dde-account-faces = callPackage ./artwork/dde-account-faces { }; @@ -98,6 +100,9 @@ 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 + 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 + go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 }; in lib.makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix index 2c7c6276cf..890ce1b64f 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "dde-api"; - version = "6.0.9"; + version = "6.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY="; + hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM="; }; vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 4dab20303d..61d7c18dca 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "deepin-desktop-schemas"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-lvAY0CJ+EohMK16fwIkB7Jq7gTpMhDimPYs9b/IklA4="; + hash = "sha256-zheIZ3Z0vm0/0F9hFcdlYwhE3/PRunxUCT8KSe4T3wk="; }; vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ="; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix deleted file mode 100644 index eed8208367..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "2.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Generate go binding of D-Bus interfaces"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix deleted file mode 100644 index 45c486d606..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, go -, pkg-config -, libgudev -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk="; - }; - - nativeBuildInputs = [ - pkg-config - go - gobject-introspection - ]; - - buildInputs = [ - libgudev - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - meta = with lib; { - description = "Generate static golang bindings for GObject"; - mainProgram = "gir-generator"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix deleted file mode 100644 index 751cba56ce..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/go-lib/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.8.27"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc="; - }; - - patches = [ - (fetchpatch { - name = "fix_IsDir_for_symlink.patch"; - url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; - sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib - cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib - rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian - runHook postInstall - ''; - - meta = with lib; { - description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix index 63ebea8f08..1f582a43b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "startdde"; - version = "6.0.13"; + version = "6.0.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U="; + hash = "sha256-2aPQaH78+J18a/SXA2i+gQ5iypsjNhcYaORGN2qkz7c="; }; vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix index 8acd1aa986..ab583e2e45 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM="; + hash = "sha256-m2unpWx8FBvZT8AmdFlzc5dp55kgtDsR62SHF8RwHhU="; }; patches = [ @@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + substituteInPlace misc/DtkCoreConfig.cmake.in \ + --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix index c3ae917a66..e0c392ff20 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0="; + hash = "sha256-OvLmK/UAuF9VEnT7DO3/m7S9Xjze5WQuZAYBTcgZbyk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix index 73638c39e6..2b8de231eb 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw="; + hash = "sha256-fnbCKqeeQE5WBnNJ0D1ihsZswDSJ/Oj98eUXFrOuk+w="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix index 3c18705819..038ab37ab2 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -12,19 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ="; + hash = "sha256-4WmnO4msQVWAEOzH1zOWfvJl5X+/VKWv4bbZAH//IXg="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - ./fix-build-on-qt-6_7.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch deleted file mode 100644 index 16d2d2ec9b..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp -index a99e17ae..0e1c57f6 100644 ---- a/src/widgets/dkeysequenceedit.cpp -+++ b/src/widgets/dkeysequenceedit.cpp -@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e) - } - - if (e->modifiers() & Qt::ShiftModifier) { -- QList possibleKeys = QKeyMapper::possibleKeys(e); -+ auto possibleKeys = QKeyMapper::possibleKeys(e); - int pkTotal = possibleKeys.count(); - if (!pkTotal) - return; - bool found = false; - for (int i = 0; i < possibleKeys.size(); ++i) { -- if (possibleKeys.at(i) - nextKey == int(e->modifiers()) -+ if (static_cast(possibleKeys.at(i)) - nextKey == static_cast(e->modifiers()) - || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) { - nextKey = possibleKeys.at(i); - found = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix index a2abd17c98..f0b7da0763 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.21"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8="; + hash = "sha256-1u+GhPI5F3t2h14VlRKpyPNArGoGgWOk2zA8D6vR6nU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix index ba921fd6ee..bf24da37b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dtkcore"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4="; + hash = "sha256-toqbEobi2R5tGnCYaShLyFdp4toEybMrWU+IORI/vu4="; }; patches = [ @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace misc/DtkCoreConfig.cmake.in \ + --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin + ''; + nativeBuildInputs = [ cmake pkg-config @@ -60,7 +65,7 @@ stdenv.mkDerivation rec { "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" "-DDSG_PREFIX_PATH='/run/current-system/sw'" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" + "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin" "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" ]; @@ -73,6 +78,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/libexec/dtk5/DCore/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin tool kit core library"; homepage = "https://github.com/linuxdeepin/dtkcore"; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkdeclarative/default.nix index 00c884e646..de084777d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkdeclarative/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dtkdeclarative"; - version = "5.6.24"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0="; + hash = "sha256-7pAC7NHsmQudAO2KvEgI5BbnsgjqxaJY5v9GNfKBm1U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix index 9066a32985..7d93e7ec99 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dtkgui"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y="; + hash = "sha256-TSU6sqdwBa86k7HcyNSJeJ6gj+n6EfIMjE8skSG5o0c="; }; patches = [ @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { "-DBUILD_DOCS=ON" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" ]; preConfigure = '' @@ -64,6 +63,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/libexec/dtk5/DGui/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin Toolkit, gui module for DDE look and feel"; homepage = "https://github.com/linuxdeepin/dtkgui"; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix index 51130710af..923833c808 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU="; + hash = "sha256-eFEigOJGw5gTi0G13/rtnqoaeTdnO0aSLfZlRwHg3yE="; }; patches = [ @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { "-DBUILD_DOCS=ON" "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" ]; preConfigure = '' @@ -76,6 +75,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/lib/dtk5/DWidget/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin graphical user interface library"; homepage = "https://github.com/linuxdeepin/dtkwidget"; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix index c7d219f8de..5fa19075cf 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.20"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU="; + hash = "sha256-yFY+bsvmVo92u6eLw9VYGAz5nehVrFob4AkdyG0nvjM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 11a342e217..660c861d95 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc="; + hash = "sha256-KoX3TkEzGNwqG8XL6op0mpTVvdSQTzqd5OpAuCU2Ok4"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix new file mode 100644 index 0000000000..3f6f9dff96 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, dtk6widget +, qt6Packages +, gtest +}: + +stdenv.mkDerivation rec { + pname = "qt6integration"; + version = "6.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-2QNHJZ4Bz21UyuRhD/9gC7Ls9GggHp4QwtFzoxyyAL4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + dtk6widget + qt6Packages.qtbase + gtest + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}" + ]; + + dontWrapQtApps = true; + + meta = { + description = "Qt platform theme integration plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt6integration"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix new file mode 100644 index 0000000000..c5c7d7f6e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, mtdev +, cairo +, xorg +, qt6Packages +}: + +stdenv.mkDerivation rec { + pname = "qt6platform-plugins"; + version = "6.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-0/hwsdB0UNzlekxfdKeItW2lXTMTzEtBR2hS153woLo="; + }; + + patches = [ + (fetchpatch { + name = "support-to-qt_6_7_1.patch"; + url = "https://github.com/linuxdeepin/qt6platform-plugins/commit/88ba963d11355391d62501cd5a6da9e3d5e9ddce.patch"; + hash = "sha256-9NiKIdY9PXBYgKQGRf5pFV+tNrHe7BjbVrnwII9lLFI="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mtdev + cairo + xorg.libSM + qt6Packages.qtbase + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms" + ]; + + dontWrapQtApps = true; + + meta = { + description = "Qt platform plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt6platform-plugins"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/util-dfm/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/util-dfm/default.nix index e726b0af73..e3fe31526c 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "util-dfm"; - version = "1.2.21"; + version = "1.2.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80="; + hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index 730d17404f..fd6ae6f425 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-device-formatter"; - version = "0.0.1.15"; + version = "0.0.1.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-M0XKvo/Qph09GIlqXTdYyPWilWyQhvFAF3c9Yf1Z9m0="; + hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-anything/default.nix new file mode 100644 index 0000000000..cfcbb6f1c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/tools/deepin-anything/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, udisks2-qt5 +, util-linux +, libnl +, glib +, pcre +}: + +stdenv.mkDerivation rec { + pname = "deepin-anything"; + version = "6.1.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-anything"; + rev = version; + hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo="; + }; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail 'add_subdirectory("kernelmod")' " " + substituteInPlace src/server/backend/CMakeLists.txt \ + --replace-fail "/usr" "$out" \ + --replace-fail "/etc" "$out/etc" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + udisks2-qt5 + util-linux + libnl + glib + pcre + ]; + + meta = { + description = "Deepin Anything file search tool"; + homepage = "https://github.com/linuxdeepin/deepin-anything"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix index 022021ea6c..85a78c6d18 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix @@ -55,8 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -257,6 +255,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-packagekit = callPackage ./misc/gnome-packagekit { }; }) // 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. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix index 85b4fc5fca..035531a5f0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix @@ -1,6 +1,5 @@ { lib , callPackage -, callPackages , config }: let @@ -72,7 +71,7 @@ in rec { # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions - (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) + (extensions: extensions // (import ./manuallyPackaged.nix { inherit callPackage; })) # Map the extension UUIDs to readable names (lib.attrValues) (mapReadableNames) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 376a4a09ba..fa5d72cb1c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -11,6 +11,7 @@ "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; + "systemd-manager@hardpixel.eu" = callPackage ./systemd-manager { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; "TopIcons@phocean.net" = callPackage ./topicons-plus { }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix new file mode 100644 index 0000000000..0b8e52af80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + glib, + # These loosen security a bit, so we don't install them by default. See also: + # https://github.com/hardpixel/systemd-manager?tab=readme-ov-file#without-password-prompt + allowPolkitPolicy ? "none", + config, + systemd ? config.systemd.package, +}: + +assert lib.elem allowPolkitPolicy [ + "none" + "pkexec" + "systemctl" +]; + +stdenvNoCC.mkDerivation rec { + pname = "gnome-shell-extension-systemd-manager"; + version = "16"; + + # Upstream doesn't post new versions in extensions.gnome.org anymore, see also: + # https://github.com/hardpixel/systemd-manager/issues/19 + src = fetchFromGitHub { + owner = "hardpixel"; + repo = "systemd-manager"; + rev = "v${version}"; + hash = "sha256-JecSIRj582jJWdrCQYBWFRkIhosxRhD3BxSAy8/0nVw="; + }; + + nativeBuildInputs = [ glib ]; + + postInstall = + '' + rm systemd-manager@hardpixel.eu/schemas/gschemas.compiled + glib-compile-schemas systemd-manager@hardpixel.eu/schemas + + mkdir -p $out/share/gnome-shell/extensions + mv systemd-manager@hardpixel.eu $out/share/gnome-shell/extensions + '' + + lib.optionalString (allowPolkitPolicy == "pkexec") '' + local bn=org.freedesktop.policykit.pkexec.systemctl.policy + mkdir -p $out/share/polkit-1/actions + substitute systemd-policies/$bn $out/share/polkit-1/actions/$bn \ + --replace-fail /usr/bin/systemctl ${lib.getBin systemd}/bin/systemctl + '' + + lib.optionalString (allowPolkitPolicy == "systemctl") '' + install -Dm0644 \ + systemd-policies/10-service_status.rules \ + $out/share/polkit-1/rules.d/10-gnome-extension-systemd-manager.rules + ''; + + passthru = { + extensionUuid = "systemd-manager@hardpixel.eu"; + extensionPortalSlug = "systemd-manager"; + }; + + meta = with lib; { + description = "GNOME Shell extension to manage systemd services"; + homepage = "https://github.com/hardpixel/systemd-manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + linsui + doronbehar + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 4c84e0053b..95941a08cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; + hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index 3505897fcf..0155fdf532 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, layer-shell-qt , lxqt-build-tools , qtbase , qtermwidget @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-SesKJCiMoiqkvMM29+0IMERozQ9zuD+NJTtaC6j7ubM="; + hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + layer-shell-qt qtbase qtermwidget qtwayland diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index 12640bb740..51b9cef886 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.0.1" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.0.0" = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE="; + "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78="; }."${version}"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 2979824f12..05923da38a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -9,8 +9,11 @@ , libxfce4util , libxklavier , upower +, withUpower ? true , xfconf , xf86inputlibinput +, colord +, withColord ? true }: mkXfceDerivation { @@ -29,15 +32,18 @@ mkXfceDerivation { libxfce4ui libxfce4util libxklavier - upower xf86inputlibinput xfconf - ]; + ] + ++ lib.optionals withUpower [ upower ] + ++ lib.optionals withColord [ colord ]; configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" - ]; + ] + ++ lib.optionals withUpower [ "--enable-upower-glib" ] + ++ lib.optionals withColord [ "--enable-colord" ]; meta = with lib; { description = "Settings manager for Xfce"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/ex_doc/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/ex_doc/default.nix index d7057a6dd9..b46d7fee6e 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/ex_doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/ex_doc/default.nix @@ -3,12 +3,12 @@ let pname = "ex_doc"; - version = "0.32.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-nNUSx2Ywj04vgT/7BQEwoNtTl1NGmbvuIS4KbvUFYzs="; + hash = "sha256-OXIRippEDYAKD222XzNJkkZdXbUkDUauv5amr4oAU7c="; }; in mixRelease { @@ -19,7 +19,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-e0lU4TXLY2geO6MI1h0kpdwsGbEyXjIRe0W43337mHk="; + hash = "sha256-fYINsATbw3M3r+IVoYS14aVEsg9OBuH6mNUqzQJuDQo="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix index f02e77753b..343363332b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix @@ -4,7 +4,6 @@ , fetchurl , ant , jdk -, jre , makeWrapper , stripJavaArchivesHook }: @@ -36,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ant + ant \ + -Dabcl.runtime.jar.path="$out/lib/abcl/abcl.jar" \ + -Dadditional.jars="$out/lib/abcl/abcl-contrib.jar" runHook postBuild ''; @@ -47,14 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out"/{share/doc/abcl,lib/abcl} cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/" cp -r dist/*.jar contrib/ "$out/lib/abcl/" - - makeWrapper ${jre}/bin/java $out/bin/abcl \ - --add-flags "-classpath $out/lib/abcl/\*" \ - ${lib.optionalString (lib.versionAtLeast jre.version "17") - # Fix for https://github.com/armedbear/abcl/issues/484 - "--add-flags --add-opens=java.base/java.util.jar=ALL-UNNAMED \\" - } - --add-flags org.armedbear.lisp.Main + install -Dm555 abcl -t $out/bin runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml index 743da0b0cf..bbc256db52 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml @@ -2,9 +2,9 @@ [7off] dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"] license = "agpl" -sha256 = "0hsqxva92k3yasrlgl7bbq3z3d2d2nd3r3i2v6vimv7mp2chfkdr" +sha256 = "06nzh23bpf9f011wr5sxqnq4nb1b7af6148qz52ri9hbb8r2mi4i" synopsis = "Markdown to Gemini text" -version = "1.31" +version = "1.32" [F-operator] dependencies = ["miscmacros", "datatype", "box"] @@ -79,9 +79,9 @@ version = "3.0.0" [amb] dependencies = ["srfi-1"] license = "bsd" -sha256 = "0ggwmsd4igg099ikn5qja5nkqmrnsw0byyk3q9y04ygvzalqyb36" +sha256 = "0n2wbxb23fai27hgk86jf9lnnrg0dvh989ysjkscdf9my96j448s" synopsis = "The non-deterministic backtracking ambivalence operator" -version = "3.0.9" +version = "3.0.10" [amqp] dependencies = ["bitstring", "mailbox", "srfi-18", "uri-generic"] @@ -105,18 +105,18 @@ synopsis = "Procedures to generate ANSI escape sequences" version = "0.6" [apropos] -dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] +dependencies = ["utf8", "srfi-1", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "01zdifhqc0jfm810106sh87w0fmpchf4dph0k8v1lyjzbj1ivmi4" +sha256 = "01h8fpz32bc3c9ldyamawvj7jf2b4b10zz08a22i90ww5lyvn90s" synopsis = "CHICKEN apropos" -version = "3.8.3" +version = "3.10.2" [arcadedb] -dependencies = ["uri-common", "medea"] +dependencies = ["medea"] license = "zlib-acknowledgement" -sha256 = "1w2iqylz0wfn7is8vss5dkwmi3pxhbh2h7ywzg39x45z2c91sd28" +sha256 = "1lhagnaxwvzax82k7qg8v5w7wj9mqi4y686j52fqiqnry99h73k0" synopsis = "An ArcadeDB database driver for CHICKEN Scheme." -version = "0.7" +version = "0.8" [args] dependencies = ["srfi-1", "srfi-13", "srfi-37"] @@ -289,9 +289,9 @@ version = "1.37" [bitwise-utils] dependencies = [] license = "public-domain" -sha256 = "065q6ha8wsj6qhg7zxkaj2qrj5sm3iz2v7shcp5wh7j3fqwbs5q5" +sha256 = "1p433kx2q1zam5a2isgnxiywgkcb77bmbqlajpr7rvm5i739h8g7" synopsis = "Bitwise utilities" -version = "1.3.0" +version = "1.3.1" [blas] dependencies = ["bind", "compile-file", "srfi-13"] @@ -352,16 +352,16 @@ version = "0.11" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] license = "bsd-1-clause" -sha256 = "0ycm95vcf1dj6m3kqii7b2a5kxyd1m6lzksz77ispay14srgw8rd" +sha256 = "1wzcqbccngcajzw4js7llys1pnmnvsmkk01v1ji6khy4kyghvspl" synopsis = "Hodge podge of macros and combinators" -version = "1.95" +version = "1.97" [brev] dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"] license = "public-domain" -sha256 = "1kbphbz21rlrsfcfqg77hm1vv7wh9z1gcwh5lb2hlrqp2yl7m7yc" +sha256 = "0gzbhyv228a76cnnisn7cqyhjsrphxn0bavxisg9rd40ndggijka" synopsis = "A huge pile of batteries and shortcuts" -version = "1.41" +version = "1.42" [byte-blob] dependencies = ["srfi-1"] @@ -422,9 +422,9 @@ version = "0.4" [check-errors] dependencies = [] license = "bsd" -sha256 = "09ffyffrv3gamjsjgbisn3yxb40wbqy5pfrs6dxw20n1ffimgfw5" +sha256 = "1xgchkpcmk7cwvbr87xmmwnw7z9ah8r8p6hv7kdkpjy66bas0yhj" synopsis = "Argument checks & errors" -version = "3.8.0" +version = "3.8.2" [checks] dependencies = ["simple-exceptions"] @@ -499,9 +499,9 @@ version = "5.0.3" [ck-macros] dependencies = [] license = "public-domain" -sha256 = "1x2d1f0fnzz5h871qgw4hkdffhd7rv7w59lq7r1y0r0jzl2rv83j" +sha256 = "1xry5blp0vjmxidp47f9i8axji2q5f7csjkqi0n1gdwkm54755jz" synopsis = "Composable macros based on the CK abstract machine" -version = "0.3.0" +version = "0.3.1" [clojurian] dependencies = ["srfi-18"] @@ -735,11 +735,11 @@ synopsis = "Directed graph in adjacency list format." version = "2.0" [directory-utils] -dependencies = ["srfi-1", "srfi-13", "miscmacros", "moremacros", "list-utils", "stack", "check-errors"] +dependencies = ["srfi-1", "utf8", "miscmacros", "moremacros", "stack", "list-utils", "check-errors"] license = "bsd" -sha256 = "0jaj7pi27d65wz1zpfxiphkdnk4an5yahhhxs28svsqprq0v0ay1" +sha256 = "0xiga98dddi5vg5h1m2vws5prk4ri96rx6l359lji62aq51h526i" synopsis = "directory-utils" -version = "2.2.6" +version = "2.3.0" [disjoint-set] dependencies = [] @@ -1078,11 +1078,11 @@ synopsis = "Chicken bindings to genann - a simple neural network library in ANSI version = "0.2.2" [generalized-arrays] -dependencies = ["check-errors", "matchable", "srfi-133", "typed-records"] -license = "bsd3" -sha256 = "0d9n1njd1mrcpqz8xim0m5x0yz94b8xyvwzyvsfq4l7q3km44v3k" -synopsis = "An implementation providing generalized arrays and storage classes for CHICKEN Scheme." -version = "0.0.7" +dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-160", "check-errors", "transducers"] +license = "bsd-3" +sha256 = "1ypga6lanhqsm8lpgk6s1nj4q024xb9kl9ar58cwj53h1irn7942" +synopsis = "Provides generalized arrays, intervals, and storage classes for CHICKEN Scheme." +version = "2.0.0" [generics] dependencies = ["simple-cells"] @@ -1108,9 +1108,9 @@ version = "1.21" [getopt-utils] dependencies = ["utf8", "srfi-1", "getopt-long"] license = "bsd" -sha256 = "0i17fj29zbbm05x68h7fy524ypk8vbr62gq6jkrwf18371l0l767" +sha256 = "1992zcps7gghhc9l7sfkglmf2rqgwvw6jz39k7q9mbs690chq1l1" synopsis = "Utilities for getopt-long" -version = "1.1.1" +version = "1.2.0" [git] dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"] @@ -1409,9 +1409,9 @@ version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1mw6z3piddy9xz494kv0243jhhirlb1dp15dph2p1ks4bhipbr4m" +sha256 = "1ghsqdnw73xz9pbl6d7j38qgs066wsy1y6q9l0ardbqkmkibwyr8" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.13" +version = "0.0.15" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1542,9 +1542,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 = "07jwz006c6yhibg7d9nb35rif04810820pss5mg7c7mbn2nzmq1q" +sha256 = "1q09kml6igd010j630m52rg7vayfsab176k3vjcsjn7ccf3i7a31" synopsis = "Levenshtein edit distance" -version = "2.4.0" +version = "2.4.1" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1703,9 +1703,16 @@ version = "2.8" [matchable] dependencies = [] license = "public-domain" -sha256 = "0bizkac4a926lbk0v2m05ysq359mzhfsqh973m72jc4gcj4azr5p" +sha256 = "1c7c61wivhn8qrj5rfivr2f0ffjgl4ccd6chk9p705rynjiv7pw0" synopsis = "Hygienic MATCH replacement" -version = "1.1" +version = "1.2" + +[math-utils] +dependencies = [] +license = "public-domain" +sha256 = "1jcr67q4pq7i34lkhbqml18rkv6w61wsqclp9k1xgvg6p2b0aaxj" +synopsis = "Miscellaneous math utilities" +version = "1.0.6" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1717,9 +1724,9 @@ version = "0.3.4" [mathh] dependencies = [] license = "public-domain" -sha256 = "1zdm58a950vslyjkw4w04c70vhjwf5bdxw79mp3cq65ik474gi8d" -synopsis = "ISO C math functions, miscellaneous math utilities, and constants" -version = "4.6.4" +sha256 = "1mf9aqjwp068a93fmkm29f5mawc15nizm8wwvfra1af7y4f434al" +synopsis = "ISO C math functions and constants" +version = "4.7.0" [matrico] dependencies = [] @@ -1780,9 +1787,9 @@ version = "4.3.8" [message-digest-type] dependencies = ["blob-utils", "string-utils", "message-digest-primitive", "check-errors"] license = "bsd" -sha256 = "0njvcflhafs5pqvhnm31alp66v1szg2y08fdlwnwq2bzzpaq83id" +sha256 = "15cp3km0lv4s28yq0ynabqmd902325692xyq2hmsv0n68j5jckdz" synopsis = "Message Digest Type" -version = "4.3.5" +version = "4.3.6" [message-digest-utils] dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] @@ -1878,16 +1885,16 @@ version = "4.0.1" [moremacros] dependencies = ["srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "09kc4wmhwkdhspk8g0i357qdq9mp1xcalgnqi8z9yasfy2k6gk1h" +sha256 = "0xwrsak9r77gyq85jhqj1hwjpmv897d8mgzqhw1q7br2clry44sk" synopsis = "More miscellaneous macros" -version = "2.5.0" +version = "2.5.3" [mosquitto] dependencies = ["srfi-1"] license = "mit" -sha256 = "0v03hljm71hl6xr1pffzcpk2izil9w2sp9k68a7iirvpcvqg9iph" +sha256 = "1pdhks3wii43l5wbmqich93zk6vy0b62h8qhv1k2wd8llv33gx6r" synopsis = "Bindings to mosquitto MQTT client library" -version = "0.1.3" +version = "0.1.4" [mpd-client] dependencies = ["regex", "srfi-1"] @@ -1969,9 +1976,9 @@ version = "5.0.8" [number-limits] dependencies = [] license = "bsd" -sha256 = "02nz5sicimp6bmka9lcbafpf7v8xxp3sml47s85wccmr0rky575q" +sha256 = "134958zarw74yrxn97sixmm987b047p7izppc0cxx9rlviq145hd" synopsis = "Limit constants for numbers" -version = "3.0.3" +version = "3.0.8" [oauth] dependencies = ["srfi-1", "srfi-13", "uri-common", "intarweb", "http-client", "hmac", "sha1", "base64"] @@ -2148,6 +2155,13 @@ sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s" synopsis = "Bindings for PostgreSQL's C-api" version = "4.1.4" +[prefixes] +dependencies = ["tree-walkers"] +license = "bsd" +sha256 = "09xy34vz2w9ngi9z2yahv3fw5xiiy4xpdmf33zfvj46k7w5dahpn" +synopsis = "prefixing in er-macro-transformers made easy" +version = "1.0" + [premodules] dependencies = ["simple-tests"] license = "bsd" @@ -2200,9 +2214,9 @@ version = "3.0" [pstk] dependencies = ["srfi-1", "srfi-13"] license = "bsd" -sha256 = "11z0ssdrpyal1px6x5qwxyabxs4y2q7glbz7mnwq0i01imwv1c2v" +sha256 = "075w2kaljy08cx8z78pi3741is1fi63bfsfdy229gkfrbkzl8vpz" synopsis = "PS/Tk: Portable Scheme interface to Tk" -version = "1.4.0" +version = "1.4.1" [pthreads] dependencies = ["srfi-18"] @@ -2319,9 +2333,9 @@ version = "1.4" [redis] dependencies = ["r7rs", "srfi-34", "srfi-35", "srfi-69", "srfi-99", "srfi-113", "srfi-128", "srfi-133", "srfi-152", "srfi-158"] license = "bsd" -sha256 = "1z8pr6dgz652h14zn1vkdm3av48lifk4vf7jzacrq0f0k14i5bc2" +sha256 = "1p3q9216y0ddnghcy83h3xm0vi2qg17kv1v1xff2sfz4mzliy6qf" synopsis = "A Redis client library for Chicken Scheme" -version = "0.5" +version = "0.6" [regex-case] dependencies = ["regex"] @@ -2466,9 +2480,9 @@ version = "0.3.2" [scheme-indent] dependencies = ["srfi-1"] license = "bsd" -sha256 = "0brwmphr724shd32dcixsn9wz9zqrhg27g7rjbiz96885maj6nwf" +sha256 = "1jjgi0wwfk3bx8ayc09y09pxg9awdx5hm397gqhg6gvjbn3sm3in" synopsis = "A Scheme code indenter" -version = "0.5" +version = "0.6" [scheme2c-compatibility] dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"] @@ -2536,9 +2550,9 @@ version = "0.4.1" [semantic-version] dependencies = ["utf8", "srfi-1", "vector-lib", "srfi-69", "srfi-128", "record-variants"] license = "bsd" -sha256 = "02y7d0lpkrn77ypk2dx8nm70lpbszz5w2cy177s4gvy88dx5qgmq" +sha256 = "10wczj83664q09zxgcnf1zr96xds6dmfvn0gvw8cq4i269ppcv0j" synopsis = "Semantic Version Utilities" -version = "0.0.13" +version = "0.0.16" [sendfile] dependencies = ["memory-mapped-files"] @@ -2610,6 +2624,13 @@ sha256 = "0ck8mgs2alvsial3ay9638ia2kl4zs63x6rc480p24sxhil6klg8" synopsis = "An efficient and powerful lexer generator" version = "1.0" +[simple-binds] +dependencies = [] +license = "bsd" +sha256 = "0b5frz0zq5b87l4l5hhca318m0mjllw9zjacbyw0l2w39l48f77z" +synopsis = "Some simple destructuring bind macros" +version = "1.1" + [simple-cells] dependencies = ["checks"] license = "bsd" @@ -3124,9 +3145,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "1m2pyp5mv09inli9jq7fm9q55nhg2xwp50f7s6cgndpp2w2kb38v" +sha256 = "0vqwg2sknm7fm677npbjdvhcfa2s6l41sgvhkk11m10b8jgnr1b3" synopsis = "Time Data Types and Procedures" -version = "4.9.5" +version = "4.9.6" [srfi-193] dependencies = [] @@ -3215,9 +3236,9 @@ version = "4.2.3" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "1pz31xrfja4y43ci5n8gplhdnasbyxx0kwlmcjzycs1js4b66ld1" +sha256 = "1jyjwkz6jz9da3n32cgja2dvwrsl9lckknxjb1ial0359ibqnc3h" synopsis = "Localization" -version = "3.0.8" +version = "3.0.11" [srfi-34] dependencies = [] @@ -3467,9 +3488,9 @@ version = "1.1" [string-utils] dependencies = ["utf8", "srfi-1", "srfi-13", "srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0f9m63flywcx7b6rhb7d562v26xilnxl0zcd8c6c4rfjsr0bdgjr" +sha256 = "1ilzdvbmmm7jnq4m3nrbxhj9x2b4d772748m9fjxzl9bqqik1a54" synopsis = "String Utilities" -version = "2.7.3" +version = "2.7.4" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] @@ -3551,9 +3572,9 @@ version = "1.0" [symbol-utils] dependencies = ["utf8"] license = "bsd" -sha256 = "0mxcdlf1i0xn70h9l5grgx1yvkbgq9rcvil02gdp9by5qqcqmklh" +sha256 = "1514yvgpknkiwjksnkcshqxz6c7sb5ab182lfwrrha3ch2islq3h" synopsis = "Symbol Utilities" -version = "2.5.0" +version = "2.6.0" [synch] dependencies = ["srfi-18", "check-errors"] @@ -3691,9 +3712,9 @@ version = "0.1.0" [toml] dependencies = ["r7rs", "rfc3339", "coops"] license = "mit" -sha256 = "10isk4rxcjabm16g59nxafm2vx0vidjq1alaxbih3gw9w2kc11l4" +sha256 = "0235ihy5y34m5nw1n75y84hs9icjls77w99c000ysm6ahlhqmq0x" synopsis = "A Chicken binding to read TOML configuration files" -version = "0.7" +version = "0.8" [topham] dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1", "module-declarations"] @@ -3733,9 +3754,9 @@ version = "1.7" [tree-walkers] dependencies = [] license = "bsd" -sha256 = "1if8njjaac4i23126jlmzw67y7hcr2hs842nwsgyzi2hi780pzvk" -synopsis = "replacement of car, cdr and consorts" -version = "1.0" +sha256 = "0zsgrw8sxg3fc8z42ghjh47jq2ycwsmsgdw3kn7fbhvypz4yrmfy" +synopsis = "replacement of car, cdr and consorts and other tree- and\nlist-routines" +version = "2.0" [tree] dependencies = ["srfi-1", "srfi-42", "srfi-69", "srfi-71"] @@ -3978,9 +3999,9 @@ version = "0.2" [zshbrev] dependencies = ["brev"] license = "lgplv3" -sha256 = "1zmb84z22p8gv1bk05x7daqpl5h1z71hpivkyc1wbjfxyymmyaxj" +sha256 = "12angz4d31vir1ss80d2ghbh0bdqnbijn44j8hrnb31ikm7xg35z" synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken" -version = "1.21" +version = "1.22" [zstd] dependencies = [] diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix index b9b7d68911..cfe5f7832d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.4.2"; in +let version = "3.4.4"; 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 = "1xg2pqmn268yi3b1hc6qky0fzhx38785x70v77px5x3fhzjvh5rs"; + sha256 = "1j7rh2kh8r67ywr4259zqwpkbj3g2isbf6piyh8j6fpgjsqbx9zx"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1ybbxg6hkwdqva2xjl9srifrfryy6vacgv20lvmkhrqn59yl7m66"; + sha256 = "05y3gfgcplnwsg1m3vgjhk0hg8sk7i92zch7zg08h3zywca04xfa"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1pnh2jm29n0hvsj1gp4abm3dcq2mqagcf489ghbx6my1mhif232f"; + sha256 = "0ih3yx0bjigfbv5dfc262rw3y4ps5pzdilps4k1scb1xhs8y9kml"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0hsrzgl3xn3lmps5cnp1yr8fvzzy19gj7pgdn22dabx52lx0x9j3"; + sha256 = "1nv7vvqcf6qsp4faqk2pqffr9kv6d5gic813k9zk20i8w6gcqs0r"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "05ldjy3vhl8bhkyjmyq6yxwd503i0jk4vzkd2jk201yzwzwkjpvf"; + sha256 = "00prc4fry3kh42lz9w34phdn07v1dm1qkkp52nph3jakg5y5dkm2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/default.nix index 4aac2301f8..7bf59dc857 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation ( runtimeMode outName dart + swiftshader ; inherit altRuntimeMode; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix index 7c2cd5cec2..a87088dc81 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix @@ -15,6 +15,7 @@ fetchgit, runCommand, llvmPackages, + llvmPackages_15, patchelf, openbox, xorg, @@ -67,6 +68,10 @@ let url = "https://swiftshader.googlesource.com/SwiftShader.git"; hash = swiftshaderHash; rev = swiftshaderRev; + + postFetch = '' + rm -rf $out/third_party/llvm-project + ''; }; llvm = symlinkJoin { @@ -78,6 +83,8 @@ let }; outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt --unoptimized"}"; + + dartPath = "${if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party"}/dart"; in stdenv.mkDerivation (finalAttrs: { pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}"; @@ -163,14 +170,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 ]; patchtools = [ - "third_party/dart/tools/sdks/dart-sdk/bin/dart" + "${dartPath}/tools/sdks/dart-sdk/bin/dart" "flutter/third_party/gn/gn" ]; dontPatch = true; patchgit = [ - "third_party/dart" + dartPath "flutter" "." ] ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia"; @@ -178,7 +185,17 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' pushd ${src.name} - ln -s $swiftshader src/flutter/third_party/swiftshader + cp ${./pkg-config.py} src/build/config/linux/pkg-config.py + + cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader + chmod -R u+w -- src/flutter/third_party/swiftshader + + ln -s ${llvmPackages_15.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project + + mkdir -p src/flutter/buildtools/${constants.alt-platform} + ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang + + ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk ${lib.optionalString (stdenv.isLinux) '' for patchtool in ''${patchtools[@]}; do @@ -198,12 +215,8 @@ stdenv.mkDerivation (finalAttrs: { popd done - mkdir -p src/flutter/buildtools/${constants.alt-platform} - ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang - - dart src/third_party/dart/tools/generate_package_config.dart - cp ${./pkg-config.py} src/build/config/linux/pkg-config.py - echo "${dartSdkVersion}" >src/third_party/dart/sdk/version + dart src/${dartPath}/tools/generate_package_config.dart + echo "${dartSdkVersion}" >src/${dartPath}/sdk/version rm -rf src/third_party/angle/.git python3 src/flutter/tools/pub_get_offline.py diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in b/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in index 2dffbe950b..aa71f8ae2a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in @@ -2,4 +2,9 @@ fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader.git"; rev = "@engine_swiftshader_rev@"; + + # Keep with in sync of pkgs/development/compilers/flutter/engine/package.nix + postFetch = '' + rm -rf $out/third_party/llvm-project + ''; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_13/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_13/data.json index 9bd8b818bf..1b61347b30 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_13/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_13/data.json @@ -1,7 +1,7 @@ { "version": "3.13.8", "engineVersion": "767d8c75e898091b925519803830fc2721658d07", - "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_16/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_16/data.json index 08cbdff5bc..4c9142a149 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_16/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_16/data.json @@ -1,7 +1,7 @@ { "version": "3.16.7", "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", - "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json index 491447493d..a05e0172ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -1,7 +1,7 @@ { "version": "3.19.4", "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_22/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_22/data.json index 140b22bbcb..2abe37d9da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_22/data.json @@ -1,7 +1,7 @@ { "version": "3.22.2", "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_23/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_23/data.json index a4087fea90..82233ea511 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_23/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_23/data.json @@ -1,7 +1,7 @@ { "version": "3.23.0-0.1.pre", "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "beta", "engineHashes": { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix index a7de840adc..adb2974cc2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix @@ -84,21 +84,20 @@ in rm -f $out/lib/libgcc_s.so* '' - # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them - # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's - # `$out/nix-support/cc-flags`. See also: - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130614895 - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130635982 - # - https://github.com/NixOS/nixpkgs/commit/404155c6acfa59456aebe6156b22fe385e7dec6f - # # move `libgcc_s.so` into its own output, `$libgcc` + # We maintain $libgcc/lib/$target/ structure to make sure target + # strip runs over libgcc_s.so and remove debug references to headers: + # https://github.com/NixOS/nixpkgs/issues/316114 + lib.optionalString enableLibGccOutput ('' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/lib - mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + mkdir -p $libgcc/${targetPlatformSlash}lib + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + '' + + lib.optionalString (targetPlatformSlash != "") '' + ln -s ${targetPlatformSlash}lib $libgcc/lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix new file mode 100644 index 0000000000..5660710f04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix @@ -0,0 +1,190 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, substituteAll +, iana-etc +, Security +, Foundation +, xcbuild +, mailcap +, buildPackages +, pkgsBuildTarget +, threadsCross +, testers +, skopeo +, buildGo123Module +}: + +let + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo123Module; }; + + 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"; + "wasm32" = "wasm"; + }.${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.23rc1"; + + src = fetchurl { + url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; + hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + }; + + 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.22.patch + ]; + + GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else 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 + # Wasi does not support CGO + CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; + + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + + 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 $out/share/go + cp -a bin pkg src lib misc api doc go.env $out/share/go + mkdir -p $out/bin + ln -s $out/share/go/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.wasi; + mainProgram = "go"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap116.nix b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap116.nix deleted file mode 100644 index 71573b0bdd..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap116.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.16"; - hashes = { - # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8"; - darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810"; - linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa"; - linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"; - linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"; - linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd"; - linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6"; - linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix deleted file mode 100644 index 3afa2ba9a1..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.17.13"; - hashes = { - # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "c101beaa232e0f448fab692dc036cd6b4677091ff89c4889cc8754b1b29c6608"; - darwin-arm64 = "e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea"; - linux-386 = "5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425"; - linux-amd64 = "4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc"; - linux-arm64 = "914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d"; - linux-armv6l = "260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86"; - linux-ppc64le = "bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254"; - linux-s390x = "08f6074e1e106cbe5d78622357db71a93648c7a4c4e4b02e3b5f2a1828914c76"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/build-idris.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/build-idris.nix index 1df763e4c4..5b7c4a92a5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/build-idris.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/build-idris.nix @@ -18,11 +18,24 @@ , ... }@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" + ) idrisLibraries; + propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; - propagatedIdrisLibraries = propagate idrisLibraries; + propagatedIdrisLibraries = propagate idrisLibraryLibs; libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2-lsp.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2-lsp.nix index 095b973cc0..59a718c045 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -11,8 +11,8 @@ let ]; globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; - idris2Api = idris2Packages.idris2Api { }; - lspLib = (idris2Packages.buildIdris { + inherit (idris2Packages) idris2Api; + lspLib = idris2Packages.buildIdris { ipkgName = "lsp-lib"; version = "2024-01-21"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ let hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; }; idrisLibraries = [ ]; - }).library { }; + }; lspPkg = idris2Packages.buildIdris { ipkgName = "idris2-lsp"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix index ccbf8ef5da..e717d9af7a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.42-r1"; + version = "6.42-r2"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-JZaMhA4M+fDgk52tWCJokG9J/a1+FQHL7+VxAT4PgQo="; + sha256 = "sha256-zNm7z2nJlxaHRcZ7Ad8t1jZW999o9WFHrEnqlOJLdk0="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index c7c119a45b..43f940a846 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -364,14 +364,14 @@ let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index ffbbe1deb0..9e3a32b298 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -394,14 +394,14 @@ in let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index 06972af065..5de76c8635 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -367,14 +367,14 @@ in let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index e50e35b2c4..113c4b8506 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -420,14 +420,14 @@ in let }) (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 786bd82fa6..d58a31bf8b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -20,9 +20,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "78ee473784e5ef6f0b19ce4cb111fb6e4d23c6b2"; - rev-version = "19.0.0-unstable-2024-06-12"; - sha256 = "sha256-oLVMwWjo6Nt8ZsTnDTfoiM5U0+1lVIc1NO+4qBNYlzs="; + rev = "9b9405621bcc55b74d2177c960c21f62cc95e6fd"; + rev-version = "19.0.0-unstable-2024-06-30"; + sha256 = "sha256-Tlk+caav7e7H6bha8YQyOl+x2iNk9iH7xKpHQkWQyJ4="; } # i.e.: # { diff --git a/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix index cdf9a5b9d2..bdc36efcd0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix @@ -9,8 +9,13 @@ , libffi , makeWrapper , config +, cudaPackages , rocmPackages_5 +, ompSupport ? true +, openclSupport ? false , rocmSupport ? config.rocmSupport +, cudaSupport ? config.cudaSupport +, autoAddDriverRunpath }: let inherit (llvmPackages_15) stdenv; @@ -31,6 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper + ] ++ lib.optionals cudaSupport [ + autoAddDriverRunpath + cudaPackages.cuda_nvcc ]; buildInputs = [ @@ -43,11 +51,19 @@ stdenv.mkDerivation rec { ] ++ lib.optionals rocmSupport [ rocmPackages.clr rocmPackages.rocm-runtime + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + (lib.getOutput "stubs" cudaPackages.cuda_cudart) ]; # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually cmakeFlags = [ "-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include" + (lib.cmakeBool "WITH_CPU_BACKEND" ompSupport) + (lib.cmakeBool "WITH_CUDA_BACKEND" cudaSupport) + (lib.cmakeBool "WITH_ROCM_BACKEND" rocmSupport) + ] ++ lib.optionals (lib.versionAtLeast version "24") [ + (lib.cmakeBool "WITH_OPENCL_BACKEND" openclSupport) ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 5a172bd360..61a8c3a5c5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,26 +18,29 @@ in stdenv.mkDerivation rec { version = "0.15.15"; # These hashes can be updated automatically by running the ./update.sh script. - src = - if stdenv.isDarwin - then - (if stdenv.isAarch64 - then - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; - } - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + src = let + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/"; + sources = { + "x86_64-linux" = fetchurl { + url = url + "linux64.tar.gz"; + sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-linux" = fetchurl { + url = url + "linux-arm64.tar.gz"; + sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5"; + }; + "x86_64-darwin" = fetchurl { + url = url + "macos.tar.gz"; sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3"; - }) - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-darwin" = fetchurl { + url = url + "macos-arm64.tar.gz"; + sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; + }; }; - + in + sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ zlib gmp ]; libPath = lib.makeLibraryPath buildInputs; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { install -D -m555 -T purs $PURS ${patchelf libPath} - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; @@ -67,7 +70,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "purs"; changelog = "https://github.com/purescript/purescript/releases/tag/v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh index 259fb8aa56..186a51a2bc 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh @@ -25,6 +25,10 @@ old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/puresc echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash" new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")" echo "v${new_version} linux tarball hash: $new_linux_version_hash" +old_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux-arm64.tar.gz")" +echo "v${old_version} linux tarball hash (current version): $old_linux_arm_version_hash" +new_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux-arm64.tar.gz")" +echo "v${new_version} linux tarball hash: $new_linux_arm_version_hash" old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")" echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash" new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")" @@ -37,6 +41,7 @@ echo echo "Replacing version and hashes in ${purescript_derivation_file}." sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_linux_arm_version_hash}/${new_linux_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_arm_version_hash}/${new_darwin_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file" diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix index a2b5cf46b5..6676a7ce6c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -10,12 +10,12 @@ let versionMap = { - "2.4.4" = { - sha256 = "sha256-ipMmJ7Px2OlhjxzcIl7csAJFaARpfiyH0UBoN2ShBtU="; - }; "2.4.5" = { sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E="; }; + "2.4.6" = { + sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 3205f5b22d..06ce12d642 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, abc-verifier , bash , bison , boost @@ -77,13 +76,27 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.38"; + version = "0.42"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-mzMBhnIEgToez6mGFOvO7zBA+rNivZ9OnLQsjBBDamA="; + hash = "sha256-P0peg81wxCG0Bw2EJEX5WuDYU7GmRqgRw2SyWK/CGNI="; + fetchSubmodules = true; + leaveDotGit = true; + postFetch = '' + # set up git hashes as if we used the tarball + + pushd $out + git rev-parse HEAD > .gitcommit + cd $out/abc + git rev-parse HEAD > .gitcommit + popd + + # remove .git now that we are through with it + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; enableParallelBuilding = true; @@ -109,25 +122,13 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace ./Makefile \ --replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' - # https://github.com/YosysHQ/yosys/pull/4199 - substituteInPlace ./tests/various/clk2fflogic_effects.sh \ - --replace-fail 'tail +3' 'tail -n +3' - chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in ''; - preBuild = let - shortAbcRev = builtins.substring 0 7 abc-verifier.rev; - in '' + preBuild = '' chmod -R u+w . make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} - echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf - - if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then - echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." - exit 1 - fi if ! grep -q "YOSYS_VER := $version" Makefile; then echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." @@ -150,16 +151,6 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeCheckInputs = [ verilog ]; - # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. - # But other tools (like mcy or symbiyosys) can't know how yosys was built, so - # they just assume that 'yosys-abc' is available -- but it's not installed - # when using ABCEXTERNAL - # - # add a symlink to fake things so that both variants work the same way. this - # is also needed at build time for the test suite. - postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; - postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; - setupHook = ./setup-hook.sh; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/fix-clang-build.patch b/third_party/nixpkgs/pkgs/development/compilers/yosys/fix-clang-build.patch index 843ffd6d65..7f93594d0c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -1,14 +1,3 @@ ---- a/Makefile -+++ b/Makefile -@@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT" - endif - - ifeq ($(CONFIG),clang) --CXX = clang -+CXX = clang++ - LD = clang++ - CXXFLAGS += -std=$(CXXSTD) -Os - ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)" --- a/tests/cxxrtl/run-test.sh +++ b/tests/cxxrtl/run-test.sh @@ -5,7 +5,7 @@ set -ex diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix index 49134a9f31..ae8baba36c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "20230107"; } + { case = range "8.14" "8.20"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20200201"; } ] null; release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix index 6e59dda15a..779900d226 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - {case = range "8.14" "8.19"; out = "1.8.5"; } + {case = range "8.14" "8.20"; out = "1.8.5"; } {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix index 3eaa6eec67..dc768e2db4 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.19"; out = "5.1.2"; } + { case = range "8.13" "8.20"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix index a6f3a8b6aa..cae401d8fd 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "DistributedComponents"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.9" "8.19"; out = "20230107"; } + { case = range "8.9" "8.20"; out = "20230107"; } { case = range "8.5" "8.16"; out = "20200131"; } ] null; release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix index 4a5c2df510..63b4acdb86 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.8" else null; + defaultVersion = if (lib.versions.range "8.11" "8.20") coq.version then "2.0.8" else null; release = { "2.0.8".sha256 = "sha256-u8T7ZWfgYNFBsIPss0uUS0oBvdlwPp3t5yYIMjYzfLc="; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index 447de89e80..117f26cc6d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.9" "8.19"; out = "20230107"; } + { case = range "8.9" "8.20"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix index 59a9c9ba11..1dd396a826 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.20.0".sha256 = "sha256-VQzeINIZAfP3Qyh29uPqcNVlNJfIzzRLtN0Cm4EuGCk="; release."8.19.1".sha256 = "sha256-W/V57h+rjb3m0ktCG83PquMHfXiv6H1Nhvw9sVEPLqM="; release."8.19.0".sha256 = "sha256-IeCBd8gcu4bAXH5I/XIT7neQIILi+EWR6qqAA4GzQD0="; release."8.18.0".sha256 = "sha256-Vpe79qCyFLOdOtFFvLKR0N+MMpGD661Q01yx4gxRhZo="; @@ -25,6 +26,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = "8.20"; out = "8.20.0"; } { case = "8.19"; out = "8.19.1"; } { case = "8.18"; out = "8.18.0"; } { case = "8.17"; out = "8.17.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index 8ee47ec85f..3ff2f16700 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -5,10 +5,11 @@ mkCoqDerivation { owner = "coq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.19"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.13" "8.20"; out = "9.0.0+coq${coq.coq-version}"; } { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } ] null; + release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY="; release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ="; release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8="; release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix index 410b43ee10..2bff522457 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "0.4.1"; } + { case = range "8.14" "8.20"; out = "0.4.1"; } { case = range "8.8" "8.16"; out = "0.4.0"; } ] null; release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 04dea2feaf..c9db564c19 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, which, coq, version ? null }: -with builtins; with lib; let +let elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [ { case = "8.11"; out = { version = "1.11.4"; };} { case = "8.12"; out = { version = "1.12.0"; };} @@ -10,14 +10,15 @@ with builtins; with lib; let { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} { case = "8.18"; out = { version = "1.18.1"; };} - { case = "8.19"; out = { version = "1.18.1"; };} + { case = "8.20"; out = { version = "1.19.2"; };} ] {} ); -in mkCoqDerivation { +in (mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.20"; out = "2.2.0"; } { case = "8.19"; out = "2.0.1"; } { case = "8.18"; out = "2.0.0"; } { case = "8.17"; out = "1.18.0"; } @@ -28,6 +29,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; @@ -67,11 +69,17 @@ in mkCoqDerivation { buildFlags = [ "OCAMLWARN=" ]; mlPlugin = true; + useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev"; propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ]; meta = { description = "Coq plugin embedding ELPI"; - maintainers = [ maintainers.cohencyril ]; - license = licenses.lgpl21Plus; + maintainers = [ lib.maintainers.cohencyril ]; + license = lib.licenses.lgpl21Plus; }; -} +}).overrideAttrs (o: + lib.optionalAttrs (o.version != null + && (o.version == "dev" || lib.versions.isGe "2.2.0" o.version)) + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ]; + }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index f4459ef29b..4ec805e8f0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.12.1"; } { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/default.nix new file mode 100644 index 0000000000..f332f0e3a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/default.nix @@ -0,0 +1,19 @@ +{ lib, mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: + +mkCoqDerivation { + inherit version; + pname = "coq-hammer"; + inherit (coq-hammer-tactics) owner repo defaultVersion release releaseRev; + + buildFlags = [ "plugin" ]; + installTargets = [ "install-plugin" ]; + extraInstallFlags = [ "BINDIR=$(out)/bin/" ]; + + mlPlugin = true; + + propagatedBuildInputs = [ coq.ocamlPackages.findlib coq-hammer-tactics ]; + + meta = coq-hammer-tactics.meta // { + description = "General-purpose automated reasoning hammer tool for Coq"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/tactics.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/tactics.nix new file mode 100644 index 0000000000..27a0105833 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-hammer/tactics.nix @@ -0,0 +1,44 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +let + owner = "lukaszcz"; + repo = "coqhammer"; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = "8.19"; out = "1.3.2+8.19"; } + { case = "8.18"; out = "1.3.2+8.18"; } + { case = "8.17"; out = "1.3.2+8.17"; } + { case = "8.16"; out = "1.3.2+8.16"; } + ] null; + + release = { + "1.3.2+8.19".sha256 = "sha256-Zd7piAWlKPAZKEz7HVWxhnzOLbA/eR9C/E0T298MJVY="; + "1.3.2+8.18".sha256 = "sha256-D+tQ+1YrSbbqc54U5UlxW1Hhly49TB2pu1LEPL2Eo64="; + "1.3.2+8.17".sha256 = "sha256-2fw66z3yFKs5g+zNCeYXiEyxPzjUr+lGDciiQiuuMAs="; + "1.3.2+8.16".sha256 = "sha256-+j2Mg9n4heXbhjRaqiTQfgBxRqfw6TPYbIuCdhu8OeE="; + }; + + releaseRev = v: "refs/tags/v${v}"; + +in + +mkCoqDerivation { + inherit version; + pname = "coq-hammer-tactics"; + + inherit owner repo defaultVersion release releaseRev; + passthru = { + inherit owner repo defaultVersion release releaseRev; + }; + + mlPlugin = true; + + buildFlags = [ "tactics" ]; + installTargets = [ "install-tactics" ]; + + meta = { + description = "Reconstruction tactics for the hammer for Coq"; + homepage = "https://github.com/lukaszcz/coqhammer"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix index b9a295617b..c189168f76 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,7 +5,7 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.19"; out = "0.3.4"; } + { case = range "8.10" "8.20"; out = "0.3.4"; } ] null; release."0.3.4".sha256 = "sha256-AhEcugUiVIsgbq884Lur/bQIuGw8prk+3AlNkP1omcw="; release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index 60926e712a..a0598d0bac 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -8,7 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; } { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index 1bd886941e..f9a4d6e795 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = "8.18"; } + { case = range "8.14" "8.20"; out = "8.18"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix index aee2f35d9e..d1c54da398 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = (range "8.17" "8.19"); out = "8.19.0"; } + { case = (range "8.17" "8.20"); out = "8.19.0"; } { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix index 704b4f8123..6998ec4459 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix @@ -8,8 +8,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } - { cases = [(range "8.11" "8.19") (isLe "2.0.0")] ; out = "0.1.1"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index 3cd742fdd3..ba84b95349 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -9,8 +9,8 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.19") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0") ]; out = "0.4.0"; } + { cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index 6554b811f4..94e868c8eb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index d229f89875..aee4d65b7c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,7 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.18" "8.19"; out = "1.7.0"; } + { case = range "8.18" "8.20"; out = "1.7.0"; } { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix index 102e52e59e..5466147f01 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { pname = "math-classes"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.17" "8.19"; out = "8.19.0"; } + { case = range "8.17" "8.20"; out = "8.19.0"; } { case = range "8.12" "8.18"; out = "8.18.0"; } { case = range "8.12" "8.17"; out = "8.17.0"; } { case = range "8.6" "8.16"; out = "8.15.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index d913b34f0f..3e071850e8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index abd300f947..afbd3bd804 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -1,10 +1,10 @@ { lib, - mkCoqDerivation, recurseIntoAttrs, + mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, hierarchy-builder, single ? false, coqPackages, coq, version ? null }@args: -with builtins // lib; + let repo = "analysis"; owner = "math-comp"; @@ -30,20 +30,21 @@ let release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } + defaultVersion = let inherit (lib.versions) range; in + lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } { cases = [ (range "8.14" "8.18") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } - { cases = [ (range "8.14" "8.18") (range "1.13" "1.15") ]; out = "0.5.2"; } - { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } - { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } - { cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; } - { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } - { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } - { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } + { cases = [ (range "8.14" "8.18") (range "1.13" "1.15") ]; out = "0.5.2"; } + { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } + { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } + { cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; } + { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } + { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } + { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } ] null; # list of analysis packages sorted by dependency order @@ -52,7 +53,7 @@ let mathcomp_ = package: let classical-deps = [ mathcomp.algebra mathcomp-finmap ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; - intra-deps = lib.optionals (package != "single") (map mathcomp_ (head (splitList (lib.pred.equal package) packages))); + intra-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages))); pkgpath = if package == "single" then "." else if package == "analysis" then "theories" else "${package}"; pname = if package == "single" then "mathcomp-analysis-single" @@ -64,8 +65,8 @@ let propagatedBuildInputs = intra-deps - ++ optionals (elem package [ "classical" "single" ]) classical-deps - ++ optionals (elem package [ "analysis" "single" ]) analysis-deps; + ++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps + ++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps; preBuild = '' cd ${pkgpath} @@ -73,26 +74,26 @@ let meta = { description = "Analysis library compatible with Mathematical Components"; - maintainers = [ maintainers.cohencyril ]; - license = licenses.cecill-c; + maintainers = [ lib.maintainers.cohencyril ]; + license = lib.licenses.cecill-c; }; - passthru = genAttrs packages mathcomp_; + passthru = lib.genAttrs packages mathcomp_; }); # split packages didn't exist before 0.6, so bulding nothing in that case patched-derivation1 = derivation.overrideAttrs (o: - optionalAttrs (o.pname != null && o.pname != "mathcomp-analysis" && - o.version != null && o.version != "dev" && versions.isLt "0.6" o.version) + lib.optionalAttrs (o.pname != null && o.pname != "mathcomp-analysis" && + o.version != null && o.version != "dev" && lib.versions.isLt "0.6" o.version) { preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; } ); patched-derivation2 = patched-derivation1.overrideAttrs (o: - optionalAttrs (o.pname != null && o.pname == "mathcomp-analysis" && - o.version != null && o.version != "dev" && versions.isLt "0.6" o.version) + lib.optionalAttrs (o.pname != null && o.pname == "mathcomp-analysis" && + o.version != null && o.version != "dev" && lib.versions.isLt "0.6" o.version) { preBuild = ""; } ); patched-derivation = patched-derivation2.overrideAttrs (o: - optionalAttrs (o.version != null - && (o.version == "dev" || versions.isGe "0.3.4" o.version)) + lib.optionalAttrs (o.version != null + && (o.version == "dev" || lib.versions.isGe "0.3.4" o.version)) { propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ]; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 35f8748f63..25b4a5a2d0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.19"; out = "1.0.1"; } + { case = range "8.10" "8.20"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 7120d95585..66d237c0a5 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,9 +7,9 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } - { cases = [ (range "8.13" "8.19") (range "1.12" "1.19") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index cdd913f6d8..f4a2387ee8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,7 +7,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ - { cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; } + { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 28ff7a5678..987990429f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; @@ -20,8 +21,9 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (isGe "8.13") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } + { cases = [ (isGe "8.17") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "2.0.0"; } + { cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 38c29f25fa..8195124668 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-ssreflect.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.0.2"; } { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index 98fdefa6d1..df7a7e27c9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -29,8 +29,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } - { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.4"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "3.2"; } + { cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index 8b9b8d6661..84f5e718ed 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } - { cases = [ (range "8.13" "8.19") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 50fc63de4c..51accc11d2 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -11,18 +11,19 @@ ############################################################################ { lib, ncurses, graphviz, lua, fetchzip, - mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false, + mkCoqDerivation, withDoc ? false, single ? false, coqPackages, coq, hierarchy-builder, version ? null }@args: -with builtins // lib; + let repo = "math-comp"; owner = "math-comp"; withDoc = single && (args.withDoc or false); - defaultVersion = with versions; lib.switch coq.coq-version [ - { case = range "8.19" "8.19"; out = "1.19.0"; } + defaultVersion = let inherit (lib.versions) range; in + lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } - { case = range "8.16" "8.19"; out = "2.2.0"; } + { case = range "8.16" "8.20"; out = "2.2.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } @@ -63,7 +64,7 @@ let packages = [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; mathcomp_ = package: let - mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (head (splitList (lib.pred.equal package) packages))); + mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages))); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' @@ -74,12 +75,12 @@ let derivation = mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; - mlPlugin = versions.isLe "8.6" coq.coq-version; - nativeBuildInputs = optionals withDoc [ graphviz lua ]; + mlPlugin = lib.versions.isLe "8.6" coq.coq-version; + nativeBuildInputs = lib.optionals withDoc [ graphviz lua ]; buildInputs = [ ncurses ]; propagatedBuildInputs = mathcomp-deps; - buildFlags = optional withDoc "doc"; + buildFlags = lib.optional withDoc "doc"; preBuild = '' if [[ -f etc/utils/ssrcoqdep ]] @@ -90,16 +91,16 @@ let fi '' + '' cd ${pkgpath} - '' + optionalString (package == "all") pkgallMake; + '' + lib.optionalString (package == "all") pkgallMake; meta = { homepage = "https://math-comp.github.io/"; - license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl jwiegley cohencyril ]; + license = lib.licenses.cecill-b; + maintainers = with lib.maintainers; [ vbgl jwiegley cohencyril ]; }; - } // optionalAttrs (package != "single") - { passthru = genAttrs packages mathcomp_; } - // optionalAttrs withDoc { + } // lib.optionalAttrs (package != "single") + { passthru = lib.genAttrs packages mathcomp_; } + // lib.optionalAttrs withDoc { htmldoc_template = fetchzip { url = "https://github.com/math-comp/math-comp.github.io/archive/doc-1.12.0.zip"; @@ -111,7 +112,7 @@ let ''; postInstall = let tgt = "$out/share/coq/${coq.coq-version}/"; in - optionalString withDoc '' + lib.optionalString withDoc '' mkdir -p ${tgt} cp -r htmldoc ${tgt} cp -r $htmldoc_template/htmldoc_template/* ${tgt}/htmldoc/ @@ -120,20 +121,20 @@ let extraInstallFlags = [ "-f Makefile.coq" ]; }); patched-derivation1 = derivation.overrideAttrs (o: - optionalAttrs (o.pname != null && o.pname == "mathcomp-all" && - o.version != null && o.version != "dev" && versions.isLt "1.7" o.version) + lib.optionalAttrs (o.pname != null && o.pname == "mathcomp-all" && + o.version != null && o.version != "dev" && lib.versions.isLt "1.7" o.version) { preBuild = ""; buildPhase = ""; installPhase = "echo doing nothing"; } ); patched-derivation2 = patched-derivation1.overrideAttrs (o: - optionalAttrs (versions.isLe "8.7" coq.coq-version || - (o.version != "dev" && versions.isLe "1.7" o.version)) + lib.optionalAttrs (lib.versions.isLe "8.7" coq.coq-version || + (o.version != "dev" && lib.versions.isLe "1.7" o.version)) { installFlags = o.installFlags ++ [ "-f Makefile.coq" ]; } ); patched-derivation = patched-derivation2.overrideAttrs (o: - optionalAttrs (o.version != null - && (o.version == "dev" || versions.isGe "2.0.0" o.version)) + lib.optionalAttrs (o.version != null + && (o.version == "dev" || lib.versions.isGe "2.0.0" o.version)) { propagatedBuildInputs = o.propagatedBuildInputs ++ [ hierarchy-builder ]; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix index 174f44b770..bfd5baf97d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, - mkCoqDerivation, recurseIntoAttrs, single ? false, + mkCoqDerivation, single ? false, coqPackages, coq, equations, version ? null }@args: -with builtins // lib; + let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -36,14 +36,14 @@ let releaseRev = v: "v${v}"; # list of core metacoq packages sorted by dependency order - packages = if versionAtLeast coq.coq-version "8.17" + packages = if lib.versionAtLeast coq.coq-version "8.17" then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ] else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; template-coq = metacoq_ "template-coq"; metacoq_ = package: let - metacoq-deps = lib.optionals (package != "single") (map metacoq_ (head (splitList (lib.pred.equal package) packages))); + metacoq-deps = lib.optionals (package != "single") (map metacoq_ (lib.head (lib.splitList (lib.pred.equal package) packages))); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' @@ -57,7 +57,7 @@ let mlPlugin = true; propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps; - patchPhase = if versionAtLeast coq.coq-version "8.17" then '' + patchPhase = if lib.versionAtLeast coq.coq-version "8.17" then '' patchShebangs ./configure.sh patchShebangs ./template-coq/update_plugin.sh patchShebangs ./template-coq/gen-src/to-lower.sh @@ -76,11 +76,11 @@ let sed -i -e 's/mv $i $newi;/mv $i tmp; mv tmp $newi;/' ./template-coq/gen-src/to-lower.sh ./pcuic/clean_extraction.sh ./safechecker/clean_extraction.sh ./erasure/clean_extraction.sh '' ; - configurePhase = optionalString (package == "all") pkgallMake + '' + configurePhase = lib.optionalString (package == "all") pkgallMake + '' touch ${pkgpath}/metacoq-config - '' + optionalString (elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) '' + '' + lib.optionalString (lib.elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) '' echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config - '' + optionalString (package == "single") '' + '' + lib.optionalString (package == "single") '' ./configure.sh local ''; @@ -90,17 +90,17 @@ let meta = { homepage = "https://metacoq.github.io/"; - license = licenses.mit; - maintainers = with maintainers; [ cohencyril ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cohencyril ]; }; - } // optionalAttrs (package != "single") - { passthru = genAttrs packages metacoq_; }) + } // lib.optionalAttrs (package != "single") + { passthru = lib.genAttrs packages metacoq_; }) ).overrideAttrs (o: - let requiresOcamlStdlibShims = versionAtLeast o.version "1.0-8.16" || - (o.version == "dev" && (versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ; + let requiresOcamlStdlibShims = lib.versionAtLeast o.version "1.0-8.16" || + (o.version == "dev" && (lib.versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ; in { - propagatedBuildInputs = o.propagatedBuildInputs ++ optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims; + propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims; }); in derivation; in diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index 4326aa9ba2..89297a6fd0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } + { cases = [ (range "8.17" "8.20") (isGe "2.1.0") ]; out = "2.2.0"; } { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index afbcc6669b..80432fa149 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.19"; out = "4.2.0"; } + { case = range "8.13" "8.20"; out = "4.2.0"; } { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index a17e19acae..f8749c8979 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.19"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.20"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.20".sha256 = "sha256-34xDOz/2xO39fnQW6Zb9CI2EKFuJZjrAdOpMEmwuzY0="; release."1.1.3+coq8.19".sha256 = "sha256-5NVsdLXaoz6qrr5ra5YfoHeuK4pEf8JX/X9+SZA0U+U="; release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I="; release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix index 764c65ee3e..9b5d827eec 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "0.1.2"; } + { case = range "8.14" "8.20"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix index 325b909d45..51d9590490 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.2.1"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0") ]; out = "1.2.0"; } - { cases = [ (range "8.10" "8.19") (isLt "2.0.0") ]; out = "1.1.3"; } + { cases = [ (range "8.10" "8.20") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix index edd28fd3b0..438f4f9fa9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -18,7 +18,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.19"; out = "10.2.0"; } + { case = range "8.12" "8.20"; out = "10.2.0"; } { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/saxpy/default.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/saxpy/default.nix index 9b7326cd32..5eb0a235ac 100644 --- a/third_party/nixpkgs/pkgs/development/cuda-modules/saxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/cuda-modules/saxpy/default.nix @@ -3,6 +3,7 @@ cmake, cudaPackages, lib, + saxpy, }: let inherit (cudaPackages) @@ -15,7 +16,6 @@ let cudatoolkit flags libcublas - setupCudaHook ; inherit (lib) getDev getLib getOutput; fs = lib.fileset; @@ -58,10 +58,19 @@ backendStdenv.mkDerivation { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) ]; + passthru.gpuCheck = saxpy.overrideAttrs (_: { + requiredSystemFeatures = [ "cuda" ]; + doInstallCheck = true; + postInstallCheck = '' + $out/bin/${saxpy.meta.mainProgram or (lib.getName saxpy)} + ''; + }); + meta = rec { description = "Simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; license = lib.licenses.mit; maintainers = lib.teams.cuda.members; + mainProgram = "saxpy"; platforms = lib.platforms.unix; badPlatforms = lib.optionals (flags.isJetsonBuild && cudaOlder "11.4") platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/write-gpu-python-test.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/write-gpu-python-test.nix new file mode 100644 index 0000000000..5f0d5c6b8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/cuda-modules/write-gpu-python-test.nix @@ -0,0 +1,29 @@ +{ + lib, + writers, + runCommand, +}: +{ + feature ? "cuda", + name ? feature, + libraries ? [ ], +}: +content: + +let + tester = writers.writePython3Bin "tester-${name}" { inherit libraries; } content; + tester' = tester.overrideAttrs (oldAttrs: { + passthru.gpuCheck = + runCommand "test-${name}" + { + nativeBuildInputs = [ tester' ]; + requiredSystemFeatures = [ feature ]; + } + '' + set -e + ${tester.meta.mainProgram or (lib.getName tester')} + touch $out + ''; + }); +in +tester' diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix index 0a15a1566f..8c5ec833c4 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,13 +4,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.35.3"; + version = "1.0.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = "v${version}"; - hash = "sha256-brWWoIOQhU/isd48VCx6tczAJnamBuOa6e/xezuHN7E="; + hash = "sha256-3VXc0Ksv6swmKEClNF5RRjX68RFLg2IRdBwcVgI5Syo="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-y7YxcBFjKcQK6ilCKOyoszq64/0xG5GgTehKrKThknU="; + vendorHash = "sha256-lB/PfUZFL5+YBcAhrMMV2ckAHPhtW2SL3/zM3L4XGVc="; postPatch = let skipTests = [ diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index e1efb46422..fb6f9608b7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1962,7 +1962,17 @@ self: super: { readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; # https://github.com/jgm/pandoc/issues/9589 - pandoc = assert super.pandoc.version == "3.1.11.1"; dontCheck super.pandoc; + pandoc = assert super.pandoc.version == "3.1.11.1"; lib.pipe super.pandoc + [ + dontCheck + (appendPatch + (pkgs.fetchpatch { + name = "drop-usage-known-bad-actor-cdn.patch"; + url = "https://github.com/jgm/pandoc/commit/5877ec546df29115163b36de32837f5e08506092.patch"; + hash = "sha256-2ffdL2dS/hHWBjJcIHbae5OdL/VKlHNKUMDHRy3hqvc="; + }) + ) + ]; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 2e81440fca..3f82461c4f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -126016,22 +126016,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring + , text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; + librarySystemDepends = [ libgnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs.gnome) gnome-keyring; - inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix index f6aeeb7fc4..b220ed8340 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - version = "0.10"; + version = "0.11"; pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "sha256-7vDxcnXhq1wJSLFHGxtwh+H+KWxh6B0JXSMPzSmQFXo="; + sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 30f85baa36..8ed9bfe117 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "4.0.21"; + version = "4.0.22"; src = fetchurl { url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-Xvh49w24tkLSBOmkEMUZwRMaPnqd20tpENIUkJyy6Yo="; + sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix index eed0913c36..18fad7b673 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ivy"; - version = "0.2.10"; + version = "0.3.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "robpike"; repo = "ivy"; - hash = "sha256-6rZfBx6jKNOEnG+cmrzgvjUoCHQe+olPeX11qX8ep38="; + hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 1c6cbb96a4..34388c8c03 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.34.0"; + version = "1.35.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-DxUEFW9NzAyaE/6vNEFfddIaxsi7qovousxZ28Hveb4="; + hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 0e4f62d42e..6f3342d057 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -78,7 +78,7 @@ let luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: attrs // { - name = namePrefix + pname + "-" + self.version; + name = namePrefix + self.pname + "-" + self.version; inherit rockspecVersion; __structuredAttrs = true; @@ -114,7 +114,7 @@ let rocksSubdir = "${self.pname}-${self.version}-rocks"; configFile = writeTextFile { - name = pname + "-luarocks-config.lua"; + name = self.pname + "-luarocks-config.lua"; text = self.luarocks_content; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix index d919e5c848..5403a2573c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pkg-config , darwin +, cmake }: let @@ -11,20 +12,21 @@ let in rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.8.0"; + version = "0.8.6"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; rev = "v${version}"; - hash = "sha256-ZVETw+GdkrR2V8RrHAWBR+avAuN0158DlJkYBquju8E="; + hash = "sha256-03ckR2FpSlaAZlhjyX3ob+7W5Pq8OLri7jT+XIM7oeQ="; fetchSubmodules = true; }; - cargoHash = "sha256-zOjDT8Sn/p3YaG+dWyYxSWUOo11p9/WG3EyNagZRtQQ="; + cargoHash = "sha256-xEUq3Cc15bUAXpUoZw8tNQo6tW3/VXeuOtjIW4zrh1Q="; nativeBuildInputs = [ pkg-config + cmake # required for libz-ng-sys ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -39,6 +41,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # require internet access + "--skip=tests::net_socket_basic" "--skip=tests::net_request_codes" "--skip=tests::net_request_compression" "--skip=tests::net_request_methods" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix index 58b43fdf48..225146b33f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.gz"; - hash = "sha256-wBVHWID2o4LnBhaclDcafdbMIgeIMvbghlr4KJwu9Cs="; + hash = "sha256-eKMRrkIkQAd0ywnvW6omM8JpcVE/i5MdMiSg64WxPgs="; }; buildInputs = [ readline ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index ba97b03052..ab5960b5ea 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -658,7 +658,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { homepage = "https://www.python.org"; changelog = let majorMinor = versions.majorMinor version; - dashedVersion = replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; + dashedVersion = replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version; in if sourceVersion.suffix == "" then "https://docs.python.org/release/${version}/whatsnew/changelog.html" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index fde8913d51..08e017fb06 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "b2"; + suffix = "b3"; }; - hash = "sha256-vxG+AbQqB6Nlnk4jNZHgPaYxtxEqph7h4DDuuMXf2Gk="; + hash = "sha256-O+CUrQixHcKgZUY1JCOceNyfKzQrAdzU4eYG27xceKU="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 3430c5806c..fbc096502f 100755 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -284,7 +284,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t if _get_attr_value(f"{attr_path}.src.leaveDotGit"): git_fetcher_args.append("--leave-dotGit") - if git_fetcher_args: + if git_fetcher_args or _get_attr_value(f"{attr_path}.src.fetcher").endswith("nix-prefetch-git"): algorithm = "sha256" cmd = [ "nix-prefetch-git", diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix index 68bea24165..8285be8ce9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-NhwFIN5xLHovbXko6Ki0szwg+MFJdIwJGude4GiSb8A="; + hash = "sha256-39elFJ7dDBpD5nbSaw+bpth6PMZiHjmPHQIS2rsFHFw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix deleted file mode 100644 index b8eb30773a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation rec { - pname = "abseil-cpp"; - version = "20220623.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${version}"; - hash = "sha256-ma8QJfSySsk2XVLA0rhwYJMQx+6HxMFgub6gi5mDrLI="; - }; - - 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/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix deleted file mode 100644 index f03ee08ea5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20230802.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-wW7dCqiiHyBHiizyV0+M6p17itwTpzHv/T0/mcXyYWE="; - }; - - cmakeFlags = [ - "-DABSL_BUILD_TEST_HELPERS=ON" - "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - 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/third_party/nixpkgs/pkgs/development/libraries/agda/generics/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/generics/default.nix new file mode 100644 index 0000000000..12815a3617 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/generics/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + pname = "generics"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "flupe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8="; + }; + + buildInputs = [ + standard-library + ]; + + # everythingFile = "./README.agda"; + + meta = with lib; { + description = + "Library for datatype-generic programming in Agda"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix index b2e13cdc06..1bd2ad6fe3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alglib3"; - version = "4.01.0"; + version = "4.02.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-lejqQbMskjRvSaaUdZ54bF86EIe0AaklnvWSwO6kvvs="; + sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index f62ed8b7d0..6e3677431e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2024.Q2.2"; + version = "2024.Q2.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "MBO7XE2C4y2ZODLGnNw17n1TlKDjD5yyjuvzvTSaQIU="; + sha256 = "kNGJWuWN2B4hEyRz2JFGSE8TiIdxujBOxF/T6nNek0A="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix index 07a76fcdfb..04f2e6c138 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.33"; + version = "1.4.34"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-oho1EonWxgBmsQiX3wPhs0jQjLFwLe49C7/SOEptYiw="; + sha256 = "sha256-AASoThCzyFharXrprUalOMufz/DDtzlc97q/dQk7B6Y="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index cedc8edce3..1e06af6cf9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.4"; + version = "14.0.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-VY/lJrmQoWY2eO/zr27JP3nuEoyBpMiu8nrTKPrmETg="; + hash = "sha256-ijWGszJ35tvDyPJ/T/9SIxwsb3YUGRwZDGb7m3i6mLU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix b/third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix index ad68b6df4d..70d7cdff13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/blaze/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.org/blaze-lib/blaze"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ Madouura ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix index 5c6c97ec01..aac58606cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc"; - version = "1.21.5"; + version = "1.21.6"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bz922lWiap3vMy8qS9dmXa8zUg5NJlg0bx3+/xz7QAk="; + sha256 = "sha256-YelKkEXAh27J0Mq1BExGuKNCYBgJCc3nwmmWLr4ZfVI="; }; # https://github.com/NixOS/nixpkgs/issues/144170 diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 3879878e47..500b868edc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-Nb/BF/+xDWV/6iPo3o/NO6EtIaAW+yGFj06AO2baFfc="; + hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix index a4fab015db..6211a801d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/recp/cglm"; description = "Highly Optimized Graphics Math (glm) for C"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix index 69b1864702..6162d8935b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}"; description = "Easy to use and fast C++ CRC library"; platforms = platforms.all; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index b5bb2de2c9..d0a8bdbafb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Q90wVqb6321+SWW5j52fb6mVRf25nExqgN/+s6OwoMk="; + hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 1597375cf7..21c18dde6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.35.0"; + version = "2.36.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-FoiPtmebHiQfULafMArFASSjGSNCri6pA9diG2ZOeeo="; + hash = "sha256-2nQUOmSyvuol6ifGOHW8jsKU5p5b0Ih4AgQOsEFR15o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix index 910494e0b4..6e0c1b5375 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -101,5 +101,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Only; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; + broken = true; # At 2024-06-25. 49 unit tests fail. + # https://hydra.nixos.org/build/263906391/nixlog/1 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index d956eae27e..33e7f45c3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-gQPlk0bDn04s2pncF22m/OpIbzF3NXKkRCZbmxfXEY4="; + sha256 = "sha256-CK7M8DsnY++KId5iyaTRuPtyWJFaMfaYUkIJpklcIeo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix index cb0d766a90..eec0756abf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { description = "Library designed to simplify the usage of the Java Native Interface"; homepage = "https://github.com/facebookincubator/fbjni"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix index b49390c61c..a911e5ba37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; description = "Functional Terminal User Interface library for C++"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/genann/default.nix b/third_party/nixpkgs/pkgs/development/libraries/genann/default.nix index f1d7373183..3f79b7ecfc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/genann/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/genann/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/codeplea/genann"; description = "Simple neural network library in ANSI C"; license = licenses.zlib; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix index dd18855508..da276f35a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/3.11.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.2"; + version = "3.11.4"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + hash = "sha256-NkyIzPw4qlDPZccA57KuRwbtEDMmEoST2/dQx40TbSw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index e24f519d1c..c68b4a02d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.12.1"; + version = "3.12.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-1up+SSIktRGT6CRP4+wXxNRNB3fzwyyk+xcRQFSaDQM="; + hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index b70e270ba6..dfd09e5dc6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -279,9 +279,13 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; pkgConfigModules = [ "gtk4" + ] ++ lib.optionals broadwaySupport [ "gtk4-broadway" + ] ++ lib.optionals stdenv.hostPlatform.isUnix [ "gtk4-unix-print" + ] ++ lib.optionals waylandSupport [ "gtk4-wayland" + ] ++ lib.optionals x11Support [ "gtk4-x11" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix index fba0a560e9..ea867bdf70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix @@ -9,13 +9,13 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "0-unstable-2023-09-25"; + version = "0-unstable-2024-06-24"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "hax11"; - rev = "2ea9d469785bbe0338729c4deeb902a259fd7b10"; - hash = "sha256-bYuIngZ76m5IgbbTFTZ8LJmpHl4nHS272Ci1B9eJIws="; + rev = "ef955862d7221d7714eafb33e28299eb758f4462"; + hash = "sha256-ND3N1oMUjmDkF7btcFucDxKxxANL9IKf08/6Kt6LX9o="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 7dc11069e9..38550115bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-AwXdYMneL75lGf4qTo/cbT243ldKDKeBK5LoDAWuE5I="; + sha256 = "sha256-A5A7h8rV23K9APeSbWpTdEsQxcaiOMa2hRDn3BVg5Pk="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix index bf595108ba..0e77aebd14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix @@ -30,10 +30,6 @@ in version = "69.1"; hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U="; }; - icu68 = make-icu { - version = "68.2"; - hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU="; - }; icu67 = make-icu { version = "67.1"; hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw="; @@ -62,16 +58,4 @@ in version = "60.2"; hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg="; }; - icu58 = make-icu { - version = "58.2"; - hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw="; - patches = [ - (fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }) - ]; - patchFlags = [ "-p4" ]; - }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index c55f3ee186..1e3d2e4923 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-ITXkdCyUtuFhgHHmy3P4ZX6GgzyxVUYz4knCCPHGClc="; + hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix index e5d4f54e9a..4e92375197 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -46,8 +46,8 @@ let patches = [ # Install imgui into split outputs: (fetchpatch { - url = "https://github.com/microsoft/vcpkg/commit/e91750f08383112e8850f209e55ed2f960181fa6.patch"; - hash = "sha256-T+DN42PRl2gWGM8zJb9wZEsDl7+XNT6CFypNX3lBHNc="; + url = "https://github.com/microsoft/vcpkg/commit/4108dd75ce9731a4fdcf50fd05034405156eaddf.patch"; + hash = "sha256-jXbR0NfyuO8EESmva5A+H3WmBfCG83OiA8ZCcWsRhQA="; }) ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix index 18057753ef..a35deb12e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix @@ -1,35 +1,29 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, fetchFromGitHub -, substituteAll -, symlinkJoin -, cmake -, doxygen -, ruby -, validatePkgConfig -, testers +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + substituteAll, + symlinkJoin, + cmake, + doxygen, + ruby, + validatePkgConfig, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "iniparser"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitLab { owner = "iniparser"; repo = "iniparser"; rev = "v${finalAttrs.version}"; - hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA="; + hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o="; }; - patches = [ - (fetchpatch { - name = "fix-paths-pkgconfig-file.patch"; - url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch"; - hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI="; - }) - ] ++ lib.optionals finalAttrs.doCheck [ + patches = lib.optionals finalAttrs.doCheck [ (substituteAll { # Do not let cmake's fetchContent download unity src = ./remove-fetchcontent-usage.patch; @@ -50,11 +44,13 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; + nativeBuildInputs = [ + cmake + doxygen + validatePkgConfig + ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; - cmakeFlags = [ - "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" - ]; + cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" ]; doCheck = false; @@ -64,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; }); + iniparser-with-tests = finalAttrs.overrideAttrs (_: { + doCheck = true; + }); }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix deleted file mode 100644 index f31f26539a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgnome-keyring"; - version = "2.32.0"; - - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkg-config intltool ]; - - configureFlags = [ - # not ideal to use -config scripts but it's not possible switch it to pkg-config - # binaries in dev have a for build shebang - "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" - ]; - - postPatch = '' - # uses pkg-config in some places and uses the correct $PKG_CONFIG in some - # it's an ancient library so it has very old configure scripts and m4 - substituteInPlace ./configure \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - pkgConfigModules = [ "gnome-keyring-1" ]; - inherit (glib.meta) platforms maintainers; - homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix index 4bcf6ae166..8d695b2b9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/default.nix @@ -1,35 +1,19 @@ -{ lib, stdenv, fetchFromGitLab -, meson, pkg-config, ninja -, libdrm -}: - -stdenv.mkDerivation rec { - pname = "libliftoff"; - version = "0.4.1"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "emersion"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY="; - }; - - nativeBuildInputs = [ meson pkg-config ninja ]; - - buildInputs = [ libdrm ]; - - meta = with lib; { - description = "Lightweight KMS plane library"; - longDescription = '' - libliftoff eases the use of KMS planes from userspace without standing in - your way. Users create "virtual planes" called layers, set KMS properties - on them, and libliftoff will pick planes for these layers if possible. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos Scrumplex ]; - }; +{ callPackage, fetchFromGitLab, ... }: +let + mkVariant = + version: hash: + callPackage ./generic.nix { + inherit version; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = "libliftoff"; + rev = "v${version}"; + inherit hash; + }; + }; +in +{ + libliftoff_0_4 = mkVariant "0.4.1" "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY="; + libliftoff_0_5 = mkVariant "0.5.0" "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libliftoff/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/generic.nix new file mode 100644 index 0000000000..0f347a6a9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libliftoff/generic.nix @@ -0,0 +1,29 @@ +{ lib, stdenv +, meson, pkg-config, ninja +, libdrm +, version +, src +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libliftoff"; + inherit version src; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ libdrm ]; + + meta = { + description = "Lightweight KMS plane library"; + longDescription = '' + libliftoff eases the use of KMS planes from userspace without standing in + your way. Users create "virtual planes" called layers, set KMS properties + on them, and libliftoff will pick planes for these layers if possible. + ''; + inherit (finalAttrs.src.meta) homepage; + changelog = "https://gitlab.freedesktop.org/emersion/libliftoff/-/tags/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos Scrumplex ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix index 436045da89..953b1101e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libndp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libndp"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-iP+2buLrUn8Ub1wC9cy8OLqX0rDVfrRr+6SIghqwwCs="; }; + patches = [ + (fetchpatch { + # https://github.com/jpirko/libndp/issues/26 + name = "CVE-2024-5564.patch"; + url = "https://github.com/jpirko/libndp/commit/05e4ba7b0d126eea4c04387dcf40596059ee24af.patch"; + hash = "sha256-O7AHjCqic7iUfMbKYLGgBAU+wdR9/MDWxBWJw+CFn/c="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix index ceda871932..3a46a88f88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.37"; + version = "8.13.39"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-TQ9Hz9fnKZhZkg+hkXgFqH4TDCWMe+fcEWE6ShwSBBU="; + hash = "sha256-NfKdOTb/P7RXyvSiTZ/15alw9sBjqoGSOys/kcIXGWg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index b8df75b3c1..ab206c5dc4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - hash = "sha256-cmH92gdQ+fmtOLgx5ibKqLZaQFzx2z+GuXhR62dtftk="; + hash = "sha256-puNzw/3oWph76um4eNuEftvWPmjC1cZIXKU9pWB++jE="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 45e54673a0..5345dffc04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,36 +1,37 @@ -From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 +From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001 From: Euan Kemp -Date: Thu, 14 Jan 2021 00:32:00 -0800 +Date: Mon, 24 Jun 2024 15:59:48 +0200 Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 ++++++++ + meson.build | 9 +++++++ meson_options.txt | 2 ++ src/ch/meson.build | 6 ++--- src/interface/meson.build | 2 +- - src/libxl/meson.build | 18 +++++++-------- + src/libxl/meson.build | 18 +++++++------- src/locking/meson.build | 8 +++---- src/lxc/meson.build | 10 ++++---- - src/meson.build | 18 +++++++-------- - src/network/meson.build | 14 ++++++------ + src/meson.build | 18 +++++++------- + src/network/meson.build | 14 +++++------ src/node_device/meson.build | 2 +- src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 38 +++++++++++++++---------------- + src/qemu/meson.build | 40 +++++++++++++++---------------- src/remote/meson.build | 10 ++++---- src/secret/meson.build | 4 ++-- src/security/apparmor/meson.build | 8 +++---- src/storage/meson.build | 6 ++--- tools/meson.build | 2 +- - 18 files changed, 88 insertions(+), 77 deletions(-) + tools/ssh-proxy/meson.build | 2 +- + 19 files changed, 90 insertions(+), 79 deletions(-) diff --git a/meson.build b/meson.build -index 9016c0458a..b26e690194 100644 +index e98ab0d5ac..376f241c07 100644 --- a/meson.build +++ b/meson.build -@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' +@@ -47,6 +47,8 @@ if host_machine.system() == 'windows' conf.set('WINVER', '0x0600') # Win Vista / Server 2008 endif @@ -39,7 +40,7 @@ index 9016c0458a..b26e690194 100644 # set various paths -@@ -57,6 +59,13 @@ else +@@ -65,6 +67,13 @@ else sysconfdir = prefix / get_option('sysconfdir') endif @@ -54,7 +55,7 @@ index 9016c0458a..b26e690194 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index 5b43cdbd6b..e9dff18441 100644 +index cdc8687795..c2b6da140c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -64,10 +65,10 @@ index 5b43cdbd6b..e9dff18441 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/ch/meson.build b/src/ch/meson.build -index 66b77907b0..6aa9bbc548 100644 +index 633966aac7..c0ce823345 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build -@@ -64,8 +64,8 @@ if conf.has('WITH_CH') +@@ -74,8 +74,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ @@ -80,10 +81,10 @@ index 66b77907b0..6aa9bbc548 100644 ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build -index 828f274422..2a6b1f8c5e 100644 +index 3d2991315e..20f3266738 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build -@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') +@@ -59,6 +59,6 @@ if conf.has('WITH_INTERFACE') } virt_install_dirs += [ @@ -92,10 +93,10 @@ index 828f274422..2a6b1f8c5e 100644 ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 0cc277db82..48d8c5b962 100644 +index e75a8f2fdb..d1800b4ea5 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') +@@ -81,14 +81,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ @@ -120,10 +121,10 @@ index 0cc277db82..48d8c5b962 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 72f7780438..abe70d20d5 100644 +index c3dfcf2961..cdc1442775 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -249,14 +249,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -143,10 +144,10 @@ index 72f7780438..abe70d20d5 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index 99d4a34213..aae477c1ee 100644 +index bf9afabc0f..6e9547000a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') +@@ -190,10 +190,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ @@ -163,10 +164,10 @@ index 99d4a34213..aae477c1ee 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index b2d951d36c..305716010f 100644 +index dd2682ec19..b330d1159e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -210,7 +210,7 @@ openrc_init_files = [] +@@ -220,7 +220,7 @@ openrc_init_files = [] # virt_install_dirs: # list of directories to create during installation @@ -175,7 +176,7 @@ index b2d951d36c..305716010f 100644 # driver_source_files: # driver source files to check -@@ -663,7 +663,7 @@ endforeach +@@ -697,7 +697,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -184,7 +185,7 @@ index b2d951d36c..305716010f 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs +@@ -760,7 +760,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -193,7 +194,7 @@ index b2d951d36c..305716010f 100644 ) if data.get('with_ip', false) -@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -910,7 +910,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, @@ -202,7 +203,7 @@ index b2d951d36c..305716010f 100644 install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) -@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -918,7 +918,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -211,7 +212,7 @@ index b2d951d36c..305716010f 100644 rename: [ init['name'] ], ) endif -@@ -882,10 +882,10 @@ endif +@@ -945,10 +945,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -227,10 +228,10 @@ index b2d951d36c..305716010f 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index b5eff0c3ab..a0f26d624e 100644 +index 07cd5cda55..699309bb66 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'), +@@ -115,11 +115,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ @@ -247,9 +248,9 @@ index b5eff0c3ab..a0f26d624e 100644 ] configure_file( -@@ -85,12 +85,12 @@ input: 'default.xml.in', +@@ -127,12 +127,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', - copy: true, + configuration: configmake_conf, install: true, - install_dir: confdir / 'qemu' / 'networks', + install_dir: install_prefix + confdir / 'qemu' / 'networks', @@ -263,10 +264,10 @@ index b5eff0c3ab..a0f26d624e 100644 ) diff --git a/src/node_device/meson.build b/src/node_device/meson.build -index 1c95975c37..a7831242db 100644 +index d66c02a0e2..f883b65431 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build -@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') +@@ -67,6 +67,6 @@ if conf.has('WITH_NODE_DEVICES') } virt_install_dirs += [ @@ -275,10 +276,10 @@ index 1c95975c37..a7831242db 100644 ] endif diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build -index 55cf8fcce4..d331086f2e 100644 +index de3d202267..346c435ee7 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build -@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') +@@ -65,9 +65,9 @@ if conf.has('WITH_NWFILTER') } virt_install_dirs += [ @@ -302,10 +303,10 @@ index 0d96c54ebe..66c92a1016 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 39f0f615cc..5f6f30f82b 100644 +index 907893d431..99b62c8955 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') +@@ -218,25 +218,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -352,10 +353,10 @@ index 39f0f615cc..5f6f30f82b 100644 ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index b2aafe6320..6972d254ca 100644 +index 831acaaa01..0ba34d3bad 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') +@@ -261,9 +261,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ @@ -367,8 +368,8 @@ index b2aafe6320..6972d254ca 100644 + install_prefix + runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data() -@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') + logrotate_conf = configuration_data({ +@@ -278,7 +278,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -377,7 +378,7 @@ index b2aafe6320..6972d254ca 100644 rename: [ name ], ) endforeach -@@ -301,7 +301,7 @@ endif +@@ -328,7 +328,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -387,10 +388,10 @@ index b2aafe6320..6972d254ca 100644 ) endif diff --git a/src/secret/meson.build b/src/secret/meson.build -index 1bda59849b..392bc2cb2e 100644 +index 3b859ea7b4..ccddb3e805 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build -@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') +@@ -48,7 +48,7 @@ if conf.has('WITH_SECRETS') } virt_install_dirs += [ @@ -412,7 +413,7 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir, ) endforeach - + @@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions command: apparmor_gen_cmd, capture: true, @@ -421,13 +422,13 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir / 'abstractions', ) endforeach - + install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], - install_dir: apparmor_dir / 'libvirt', + install_dir: install_prefix + apparmor_dir / 'libvirt', ) - + if not conf.has('WITH_APPARMOR_3') @@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3') # files in order to limit the amount of filesystem clutter. @@ -439,10 +440,10 @@ index b9257c816d..98701755d8 100644 ) endif diff --git a/src/storage/meson.build b/src/storage/meson.build -index 26e7ff1a1a..ad5c6eddc3 100644 +index 404d6a6941..fb4e67a0a8 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build -@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') +@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE') } virt_install_dirs += [ @@ -456,10 +457,10 @@ index 26e7ff1a1a..ad5c6eddc3 100644 endif diff --git a/tools/meson.build b/tools/meson.build -index f4b4a16c29..059c73a955 100644 +index 1bb84be0be..e04a4e986d 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -468,6 +469,18 @@ index f4b4a16c29..059c73a955 100644 endif if host_machine.system() == 'windows' +diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build +index e9f312fa25..95d5d8fe0b 100644 +--- a/tools/ssh-proxy/meson.build ++++ b/tools/ssh-proxy/meson.build +@@ -20,6 +20,6 @@ if conf.has('WITH_SSH_PROXY') + output: '@BASENAME@', + configuration: tools_conf, + install: true, +- install_dir : sshconfdir, ++ install_dir : install_prefix + sshconfdir, + ) + endif -- -2.35.1 +2.45.1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index ec35e5727c..67d1f22dca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -115,28 +115,18 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "10.0.0"; + version = "10.4.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xFl8AHcbeuydWzhJNnwZ3Bd7TQiTU8hjBxaALXvcLgE="; + hash = "sha256-grQyILVy0IYbbz/Wau8QRfCub7j+5nhnkfs2tprfpO0="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - (fetchpatch { - name = "CVE-2024-2494.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; - hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; - }) - (fetchpatch { - name = "CVE-2024-1441.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; - hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; - }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; @@ -150,7 +140,7 @@ stdenv.mkDerivation rec { sed -i '/commandtest/d' tests/meson.build sed -i '/virnetsockettest/d' tests/meson.build # delete only the first occurrence of this - sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build '' + lib.optionalString isLinux '' for binary in mount umount mkfs; do @@ -173,6 +163,7 @@ stdenv.mkDerivation rec { sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build ''; strictDeps = true; @@ -283,6 +274,7 @@ stdenv.mkDerivation rec { (cfg "install_prefix" (placeholder "out")) (cfg "localstatedir" "/var") (cfg "runstatedir" (if isDarwin then "/var/run" else "/run")) + (cfg "sshconfdir" "/etc/ssh/ssh_config.d") (cfg "init_script" (if isDarwin then "none" else "systemd")) (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) @@ -313,6 +305,7 @@ stdenv.mkDerivation rec { (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) + (feat "ssh_proxy" isLinux) (feat "tests" true) (feat "udev" isLinux) (feat "yajl" true) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix index 446735c5ee..1ddc1c3534 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwbxml"; - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitHub { owner = "libwbxml"; repo = "libwbxml"; rev = "${pname}-${version}"; - sha256 = "sha256-zmMsp5xS13rqfSWXXb0FGQcGZkrSMRYc/GQppO4/+Z4="; + sha256 = "sha256-yy8+CyNKXuttCmxRxH/XptIloDklto4f5Zg0vnwnneY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix index feb0f1840b..163389fb11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zraorg/ZRA"; description = "Library for ZStandard random access"; platforms = platforms.all; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix b/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix index 268c89c390..b2f4db56f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix @@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md"; platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix index ac8afa938e..7f65505793 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/magic-enum/default.nix @@ -2,16 +2,19 @@ , lib , stdenv , cmake +, nix-update-script +, testers +, magic-enum }: stdenv.mkDerivation rec{ pname = "magic-enum"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "Neargye"; repo = "magic_enum"; rev = "refs/tags/v${version}"; - hash = "sha256-Q82HdlEMXpiGISnqdjFd0rxiLgsobsoWiqqGLawu2pM="; + hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY="; }; nativeBuildInputs = [ cmake ]; @@ -24,11 +27,16 @@ stdenv.mkDerivation rec{ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - meta = with lib;{ + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = magic-enum; }; + }; + + meta = { description = "Static reflection for enums (to string, from string, iteration) for modern C++"; homepage = "https://github.com/Neargye/magic_enum"; changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Alper-Celik ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Alper-Celik ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix index e99671b4fc..9ab45a77ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.2"; + version = "1.27.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-l3iZeu6Y+ZB9bYIg4ivG1o0ou3pXaBZ9dg61b6ie2Jw="; + hash = "sha256-j/Z1fwP7Lt1izRmSxAqnWDX7ehD7QQWXERUIdyPpwMU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix deleted file mode 100644 index 5353bac3e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ callPackage -, cmake -, fetchFromGitHub -, lib -, protobuf -, python3 -, stdenv -, buildPackages -, mallocBuild ? false -}: - -stdenv.mkDerivation rec { - pname = "nanopb"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-B9J+GkgOBR4iZaP6/2ykcjbkifoyhkuukkjK/CLBZj0="; - }; - - nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; - - pythonPath = with python3.pkgs; [ python3.pkgs.protobuf six ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} - "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a - "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc" - ] ++ lib.optional mallocBuild "-DCMAKE_C_FLAGS=-DPB_ENABLE_MALLOC 1"; - - postInstall = '' - mkdir -p $out/share/nanopb/generator/proto - cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto - cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - passthru.tests = { - simple-proto2 = callPackage ./test-simple-proto2 {}; - simple-proto3 = callPackage ./test-simple-proto3 {}; - message-with-annotations = callPackage ./test-message-with-annotations {}; - message-with-options = callPackage ./test-message-with-options {}; - }; - - meta = with lib; { - inherit (protobuf.meta) platforms; - - description = "Protocol Buffers with small code size"; - homepage = "https://jpa.kapsi.fi/nanopb/"; - license = licenses.zlib; - maintainers = with maintainers; [ kalbasit ]; - - longDescription = '' - Nanopb is a small code-size Protocol Buffers implementation in ansi C. It - is especially suitable for use in microcontrollers, but fits any memory - restricted system. - - - Homepage: jpa.kapsi.fi/nanopb - - Documentation: jpa.kapsi.fi/nanopb/docs - - Downloads: jpa.kapsi.fi/nanopb/download - - Forum: groups.google.com/forum/#!forum/nanopb - - In order to use the nanopb options in your proto files, you'll need to - tell protoc where to find the nanopb.proto file. - You can do so with the --proto_path (-I) option to add the directory - ''${nanopb}/share/nanopb/generator/proto like so: - - protoc --proto_path=. --proto_path=''${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=''${nanopb}/bin/protoc-gen-nanopb --nanopb_out=out file.proto - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index cb4a38cded..baae6b953f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-1+nC5Io459T/Czr6bTfdGy2GB5MMrhK+EBLQIPIX5QM="; + hash = "sha256-QGHmet7Tbuyue48hjtqdl6F2PzQLuWAVwW4xvPEI3NU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix index 3f45d2e39c..63a7d2c879 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/third_party/nixpkgs/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.101"; - hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts="; + version = "3.101.1"; + hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix index 3f554807d0..54e821b178 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://oatpp.io/"; description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; license = licenses.asl20; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 639ff62887..a5eeb4a193 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/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.4.3"; + version = "3.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ak49oFZkWNVjt98KXKqBGwKh7nz13/FO5riY7MIDR8g="; + hash = "sha256-IOS5w84/Dnwjqgk5Lf6o6P1l9q5KBUUll250B1mh/Gc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index b311736498..1a62114148 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -29,10 +29,7 @@ let stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; howard-hinnant-date = fetchFromGitHub { owner = "HowardHinnant"; @@ -249,6 +246,6 @@ effectiveStdenv.mkDerivation rec { # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ jonringer puffnfresh ck3d cbourjau ]; + maintainers = with maintainers; [ puffnfresh ck3d cbourjau ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 361756f94e..981ab14ddc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -143,6 +143,15 @@ let # trying to build binaries statically. ++ lib.optional static "no-ct" ++ lib.optional withZlib "zlib" + # /dev/crypto support has been dropped in OpenBSD 5.7. + # + # OpenBSD's ports does this too, + # https://github.com/openbsd/ports/blob/a1147500c76970fea22947648fb92a093a529d7c/security/openssl/3.3/Makefile#L25. + # + # https://github.com/openssl/openssl/pull/10565 indicated the + # intent was that this would be configured properly automatically, + # but that doesn't appear to be the case. + ++ lib.optional stdenv.hostPlatform.isOpenBSD "no-devcryptoeng" ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [ # This is necessary in order to avoid openssl adding -march # flags which ultimately conflict with those added by diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix index 13869dba89..53a3d080f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.4"; + version = "4.6.5"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-7VltECiXQY+6M5EE17SKj0KwLk0+gOJfbLqprafIgLQ="; + hash = "sha256-0k753wogNW8oW//mlVWxGLt8VIO+29f0C4CJ+rGprvw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index bfe1cf1139..66714ba16c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -35,8 +35,8 @@ in builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { pname = "G4NDL"; - version = "4.7"; - sha256 = "sha256-fn09JiEQLcYU91OtkocwopDRlmDu2WMEqdJLRT1nAwk="; + version = "4.7.1"; + sha256 = "sha256-06yuSGIhGNJXneJKVNUz+yQWvw2p3SiPFyTfFIWkbHw="; envvar = "NEUTRONHP"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 3b67b6a375..569a0b3e69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.2.1"; + version = "11.2.2"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-g122VD1csugBZ1lYllvpaHf2bWkHu1IZVLWYt4Xerl4="; + hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0="; }; # Fix broken paths in a .pc diff --git a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index 9432722647..470668bb1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -25,8 +25,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4="; }; - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 - prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + prePatch = '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-models)" "" + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 0822c78826..607565b8fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.3"; + version = "0.5.5"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-bZZIrD+SxAolDM0BRjcN4YCM26lnjkw8pIX54wSYrsk="; + hash = "sha256-evqQCKf4oE/PwkAOMPPPw8LPiNIWQ2gkOJzsFC8UN+k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix index 77841a3f5e..ba5c451410 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "pplite"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://github.com/ezaffanella/PPLite/raw/main/releases/pplite-0.11.tar.gz"; - hash = "sha256-6IS5zVab8X+gnhK8/qbPH5FODFaG6vIsIG9TTEpfHEI="; + url = "https://github.com/ezaffanella/PPLite/raw/main/releases/pplite-0.12.tar.gz"; + hash = "sha256-9qulVEIZRPHV5GnVmp65nMrGrUwRGkR8i8ORbLdHb1E="; }; buildInputs = [ flint gmp ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/27.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/27.nix index 0f256c5c78..03336c2a0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/27.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/27.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "27.1"; - hash = "sha256-9XOcjNm4k4VhQ/XagcVO2tXxp6bBdyuvrS7sNGy4wG0="; + version = "27.2"; + hash = "sha256-9avetEoB51WblGRy/7FTmhCb06Vi1JfwWv2dxJvna2U="; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index cf00d1d50b..e29cbe6d73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; homepage = "https://protobuf.dev/"; - maintainers = with lib.maintainers; [ jonringer ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "protoc"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index b1308159eb..dabb77ea0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -174,6 +174,12 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtsystems = [ + # Fix crash if no X11 display available + (fetchpatch { + url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/1a4df40671d6f1bb0657a9dfdae4cd9bd48fcf21/debian/patches/1005_check_XOpenDisplay.patch"; + hash = "sha256-/onla2nlUSySEgz2IYOYajx/LZkJzAKDyxwAZzy0Ivs="; + }) + # Enable building with udisks support (fetchpatch { url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/a23fd92222c33479d7f3b59e48116def6b46894c/debian/patches/2001_build_with_udisk.patch"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 7583d7d6ff..79c95c4d89 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index df105c8baa..0475a67d56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.7.1"; + version = "6.7.2"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-Dl+ZJjQU0vHurnhRVMYh0ry74iXb27Zld5dT21AxVhI="; + hash = "sha256-5OvU8I7hSnbBbu8OTrd0o2KSOyIMVfGGUSy4IsA85fA="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 25b5f5f48b..aeca3be253 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: /home/k900/gh/NixOS/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qt3d-everywhere-src-6.7.1.tar.xz"; - sha256 = "0yrmsn02ykd3k59mqvvjf4rwmhbx05i77blv6n41nsmxh6nc17pm"; - name = "qt3d-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qt3d-everywhere-src-6.7.2.tar.xz"; + sha256 = "1pwagjicvqc7lbypkw7wvjznndyzqm2ihisqdqc36ccp0kcqgh4b"; + name = "qt3d-everywhere-src-6.7.2.tar.xz"; }; }; qt5compat = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz"; - sha256 = "02b011244vnq6v0fx78h084ff1nmxbzyrwryxrqc33qm37jbpi21"; - name = "qt5compat-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qt5compat-everywhere-src-6.7.2.tar.xz"; + sha256 = "00y071p09v91ascxg3llc0yfbx7xs24smcgxckdrnkgwkqcba9l8"; + name = "qt5compat-everywhere-src-6.7.2.tar.xz"; }; }; qtactiveqt = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtactiveqt-everywhere-src-6.7.1.tar.xz"; - sha256 = "0id5nmk8l0gyfsngq782pyg5ag5syr21dvmd4dy4kbs3w4hqf6fb"; - name = "qtactiveqt-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtactiveqt-everywhere-src-6.7.2.tar.xz"; + sha256 = "1y02pyb2bz9wf5jmf2kh20wqq2vmq8afmgrs0pvhgfvyrs8b7an0"; + name = "qtactiveqt-everywhere-src-6.7.2.tar.xz"; }; }; qtbase = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz"; - sha256 = "06ffdad2g0pcsyzicj8rgvixyx7ihfmgzvqlwxhxid6cpnhqscxp"; - name = "qtbase-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz"; + sha256 = "16bmfrjfxjajs6sqg1383ihhfwwf69ihkpnpvsajh5pv21g2mwn5"; + name = "qtbase-everywhere-src-6.7.2.tar.xz"; }; }; qtcharts = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtcharts-everywhere-src-6.7.1.tar.xz"; - sha256 = "132x7l43fm6m3jw3r8myqwr0kras161sg0ddkgaz04n8ndd8fdn2"; - name = "qtcharts-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtcharts-everywhere-src-6.7.2.tar.xz"; + sha256 = "1nlv4z2rvhrn1f1f7n6qdag7lmkpl3idnj6ph572qzwb8lvs9xh0"; + name = "qtcharts-everywhere-src-6.7.2.tar.xz"; }; }; qtconnectivity = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtconnectivity-everywhere-src-6.7.1.tar.xz"; - sha256 = "1jrxlwh5avhri0ykzvqwy2y2r3qazs05vn5ask4l3ga2wkxhl0bh"; - name = "qtconnectivity-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtconnectivity-everywhere-src-6.7.2.tar.xz"; + sha256 = "1s08djgzhh5p9ij0hxbrrcx9n7r7f0ba6pr9793mdsgh8ar23lwf"; + name = "qtconnectivity-everywhere-src-6.7.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdatavis3d-everywhere-src-6.7.1.tar.xz"; - sha256 = "0z0scbmknq6bh9dqnicm3g24bf313bv3pa78lwdaggzg5z6i03ga"; - name = "qtdatavis3d-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdatavis3d-everywhere-src-6.7.2.tar.xz"; + sha256 = "0lsfd737zi8517scys3xj4c9l505vvkdg3n6dw89bdfyjmywisy0"; + name = "qtdatavis3d-everywhere-src-6.7.2.tar.xz"; }; }; qtdeclarative = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz"; - sha256 = "074zzmc1acha41dnz51gqs9x3niqyks5g356p22r6n9gxnb5q4w1"; - name = "qtdeclarative-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz"; + sha256 = "16drp7yjsm50cvsyww9xk15hzf2csax02vpbv0jx8hlcmyhwnaac"; + name = "qtdeclarative-everywhere-src-6.7.2.tar.xz"; }; }; qtdoc = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdoc-everywhere-src-6.7.1.tar.xz"; - sha256 = "0kak2d0n8fbk70zbi7ln0bda46fcqln0p43qzzid6bmc8h42ws6d"; - name = "qtdoc-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdoc-everywhere-src-6.7.2.tar.xz"; + sha256 = "0vbmhx2rbfbxgzz1ipa185wvnm08a43sdr47y9jn1ivdnrn4bhd0"; + name = "qtdoc-everywhere-src-6.7.2.tar.xz"; }; }; qtgraphs = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtgraphs-everywhere-src-6.7.1.tar.xz"; - sha256 = "0f5wzzs6w2cq81rzx98lyc40jw37p8708dmdm7sgx8l93jclln3i"; - name = "qtgraphs-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtgraphs-everywhere-src-6.7.2.tar.xz"; + sha256 = "0046293800if5ca04r40wsa4gxh8r5q6c863yrx3cmjadqk3m0fq"; + name = "qtgraphs-everywhere-src-6.7.2.tar.xz"; }; }; qtgrpc = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtgrpc-everywhere-src-6.7.1.tar.xz"; - sha256 = "186g1bndldf74hg3922vbw01mw44jy5l2y71zcgkw6r6y7w3994w"; - name = "qtgrpc-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtgrpc-everywhere-src-6.7.2.tar.xz"; + sha256 = "0zp1l9vf0p78f53mhirs4crw6cjy6fmv26n7nndyrk8a0hz8b7wd"; + name = "qtgrpc-everywhere-src-6.7.2.tar.xz"; }; }; qthttpserver = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qthttpserver-everywhere-src-6.7.1.tar.xz"; - sha256 = "1nxvyiyi9y7vgxdywrn2rlyfxq4snnvxlw2awzawh905l8g8687d"; - name = "qthttpserver-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qthttpserver-everywhere-src-6.7.2.tar.xz"; + sha256 = "11lbfx08yl725w4n8dmvviscixvfkpzx8ijhy74gx0waz6sbjlq3"; + name = "qthttpserver-everywhere-src-6.7.2.tar.xz"; }; }; qtimageformats = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtimageformats-everywhere-src-6.7.1.tar.xz"; - sha256 = "17z7vywfs4qqkyzqmfj8jis84f8l4bw6323b8w0d0r0hfy7vjcx7"; - name = "qtimageformats-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtimageformats-everywhere-src-6.7.2.tar.xz"; + sha256 = "1mp5bi45gcmsds0g2xfjd1mklrijbwfv0hx4s1md2rxfbxwdi8g1"; + name = "qtimageformats-everywhere-src-6.7.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz"; - sha256 = "1yclzaj93ygy5kyxi4ri6i8yzxwlikkn0hldszci03knchadmz50"; - name = "qtlanguageserver-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlanguageserver-everywhere-src-6.7.2.tar.xz"; + sha256 = "14hs20738d2ljfb5la8p0lip7qranjnrwl5fwdhs1zs4a5jzwndn"; + name = "qtlanguageserver-everywhere-src-6.7.2.tar.xz"; }; }; qtlocation = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlocation-everywhere-src-6.7.1.tar.xz"; - sha256 = "02464sv5gg8z5pmnwjba584fqw1vi0xlzlish9gs7zf95s61fw1q"; - name = "qtlocation-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlocation-everywhere-src-6.7.2.tar.xz"; + sha256 = "0pa8ibw490p3433ysni73f0gpz7gvxyl2abh3ygvd28ipxcdlcpj"; + name = "qtlocation-everywhere-src-6.7.2.tar.xz"; }; }; qtlottie = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlottie-everywhere-src-6.7.1.tar.xz"; - sha256 = "0z52jh4mw1pqvcldblwn4igq888hg0p1bgnhndi89rnkrdli1pka"; - name = "qtlottie-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlottie-everywhere-src-6.7.2.tar.xz"; + sha256 = "03piwc7p0lgqm73rx2kf5ckh986nv9dkssfl47js8lnkb29vrbyr"; + name = "qtlottie-everywhere-src-6.7.2.tar.xz"; }; }; qtmultimedia = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtmultimedia-everywhere-src-6.7.1.tar.xz"; - sha256 = "0gndclyixwj0g5yzfpamr2fi0q288nn4h9gy76yz2nvzf91iavb5"; - name = "qtmultimedia-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtmultimedia-everywhere-src-6.7.2.tar.xz"; + sha256 = "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"; + name = "qtmultimedia-everywhere-src-6.7.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtnetworkauth-everywhere-src-6.7.1.tar.xz"; - sha256 = "0pap87c4km4isygmhdmamrfhis69jdj6j2fjgccxsb2gqc2klaq1"; - name = "qtnetworkauth-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtnetworkauth-everywhere-src-6.7.2.tar.xz"; + sha256 = "0w7l5lhhxhg9x1rd66727gwkpzi6l7wmyc0c4qrfp2g5rx7q42bz"; + name = "qtnetworkauth-everywhere-src-6.7.2.tar.xz"; }; }; qtpositioning = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtpositioning-everywhere-src-6.7.1.tar.xz"; - sha256 = "0lsgh01bnca766h3iv55fc9arrrd9ck25zlfgkljclfkp130sasw"; - name = "qtpositioning-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtpositioning-everywhere-src-6.7.2.tar.xz"; + sha256 = "073v10z1axmqydrvdka9g69wr117kzhvci9sjr110swgmbq0j002"; + name = "qtpositioning-everywhere-src-6.7.2.tar.xz"; }; }; qtquick3d = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquick3d-everywhere-src-6.7.1.tar.xz"; - sha256 = "1s9zm6akk8c0r30mabdipqybhdxihq4riapxph221nmvgz60sfff"; - name = "qtquick3d-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquick3d-everywhere-src-6.7.2.tar.xz"; + sha256 = "0w2js64s1wg86dblqmmy9cyjz2x96f9qbk4674xjsbnsqspgk3xv"; + name = "qtquick3d-everywhere-src-6.7.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquick3dphysics-everywhere-src-6.7.1.tar.xz"; - sha256 = "0xdxrx41f4kssjnmwrj1fza3zbr5awc73mbbb9gqxc43k11523rg"; - name = "qtquick3dphysics-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquick3dphysics-everywhere-src-6.7.2.tar.xz"; + sha256 = "0h21dq5yplqizyk43agfw7yzyjfcs3d8bl7jq6n07g2fnjw91izz"; + name = "qtquick3dphysics-everywhere-src-6.7.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz"; - sha256 = "1qindhqqsp9y5gf82jga1fyvs81l1pli8b3rf5f4a9pqg6n140jb"; - name = "qtquickeffectmaker-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquickeffectmaker-everywhere-src-6.7.2.tar.xz"; + sha256 = "0vbmgdqlwihi379z1yr8ci09jxr93jrkgd8ripr2jb680z72c3rv"; + name = "qtquickeffectmaker-everywhere-src-6.7.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquicktimeline-everywhere-src-6.7.1.tar.xz"; - sha256 = "0i2pf9a1y50589ly00qaiik8q7ydmw2vf6jg2nq3r8dphx6j0y9d"; - name = "qtquicktimeline-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquicktimeline-everywhere-src-6.7.2.tar.xz"; + sha256 = "1sqr0xmiz33wfl5db24chq3gsbs0p17ylbin23gcx5gh3jhdxv91"; + name = "qtquicktimeline-everywhere-src-6.7.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtremoteobjects-everywhere-src-6.7.1.tar.xz"; - sha256 = "1x6c95wkxd28a2dplv0956rqfr5kw96f33aqvncxcm7qp80jn0g7"; - name = "qtremoteobjects-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtremoteobjects-everywhere-src-6.7.2.tar.xz"; + sha256 = "10vlkg5v5hc8fwiw9x06d84z6cs4i5kxm652si3lwvvxma0np40b"; + name = "qtremoteobjects-everywhere-src-6.7.2.tar.xz"; }; }; qtscxml = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtscxml-everywhere-src-6.7.1.tar.xz"; - sha256 = "0kxjcx8rp8g6rrg153xwakr3jbm1accgjmzahxkbv2g8hi942b82"; - name = "qtscxml-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz"; + sha256 = "0vy80npai5ikwlf0ghxf5xj8vq1hi3cdjgddjas2g3yl0qszkv10"; + name = "qtscxml-everywhere-src-6.7.2.tar.xz"; }; }; qtsensors = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtsensors-everywhere-src-6.7.1.tar.xz"; - sha256 = "1wpv1p43h40pmmy8wya6f92aysyp9z0w3yfs2af06w8gv4bllsfm"; - name = "qtsensors-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtsensors-everywhere-src-6.7.2.tar.xz"; + sha256 = "0ndvwra9bssfqw32bk5mbj3zdqgi9zshm0gd0bfd8vn5hz3xxlga"; + name = "qtsensors-everywhere-src-6.7.2.tar.xz"; }; }; qtserialbus = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz"; - sha256 = "13v2anjsdwkkm4clkcinih2118vg5nm9dafpr47h86xq8pahafai"; - name = "qtserialbus-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtserialbus-everywhere-src-6.7.2.tar.xz"; + sha256 = "0asb6xnp6gnn41bivirld1llhb2zmbgidianv7blcms5kfliqr37"; + name = "qtserialbus-everywhere-src-6.7.2.tar.xz"; }; }; qtserialport = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz"; - sha256 = "11jqx8j62dyd5n63222zwpk5n7sg45laa6qi98p2ylpxidwa6hz5"; - name = "qtserialport-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtserialport-everywhere-src-6.7.2.tar.xz"; + sha256 = "1z5lsgdl4g48fr2kcp7zznv5jyv42xmd4qn6rrxikd8w2v8lrhr1"; + name = "qtserialport-everywhere-src-6.7.2.tar.xz"; }; }; qtshadertools = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz"; - sha256 = "1hhhg7qs28mdd9s8wah2qvpkv7760jd4i10s37cbmqmjhnly71g5"; - name = "qtshadertools-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtshadertools-everywhere-src-6.7.2.tar.xz"; + sha256 = "1hbw5xz12frydk787rl6cgfxm2bxlzkxiwcxjjmgq04cmk039ypd"; + name = "qtshadertools-everywhere-src-6.7.2.tar.xz"; }; }; qtspeech = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtspeech-everywhere-src-6.7.1.tar.xz"; - sha256 = "127ba7vqqrgg7hw2c0aix3qk8vn5xh3ilh7w1k5za3pwr0aisvvc"; - name = "qtspeech-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtspeech-everywhere-src-6.7.2.tar.xz"; + sha256 = "1khl90m6jd2zg0r0fncdz3r1w2l96vwp6jihpq9rgr730ja7d36c"; + name = "qtspeech-everywhere-src-6.7.2.tar.xz"; }; }; qtsvg = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz"; - sha256 = "1knb0xc662ajikbhsg1j3i6j4g97xn2759dpcga1vi18f87vim9y"; - name = "qtsvg-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtsvg-everywhere-src-6.7.2.tar.xz"; + sha256 = "00ggr84l1h8did6ivprv343rwwcl7j2bbbilxqzmiqsvlf3143gv"; + name = "qtsvg-everywhere-src-6.7.2.tar.xz"; }; }; qttools = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz"; - sha256 = "094qv7mpzi3g9cbrlwix8qzfp64a5s4h82d1g699bws8cbgwslq9"; - name = "qttools-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz"; + sha256 = "0ajbma9lbrb0d048bvg2xl74m833ddv2b9684r3hjcr53fnmbs2q"; + name = "qttools-everywhere-src-6.7.2.tar.xz"; }; }; qttranslations = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qttranslations-everywhere-src-6.7.1.tar.xz"; - sha256 = "1x7vwj4f3sddq5g3mpfvyqigkc0s0ggp341l0drhw3ibhxjibmq3"; - name = "qttranslations-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qttranslations-everywhere-src-6.7.2.tar.xz"; + sha256 = "1a9cb1br3wqn0rshkgj21hba3r7jx8dbavc3ayfjgdy1bl5phicq"; + name = "qttranslations-everywhere-src-6.7.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz"; - sha256 = "0pd8rg6qn3grlari3lgj46b85l5r6sal5g9qkf82yqkz3cyxhv3v"; - name = "qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz"; + sha256 = "03qqrs0nv6bhnm0ps54inw43xgnfx3vdq8mqq5wzyq09basn81ij"; + name = "qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz"; }; }; qtwayland = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz"; - sha256 = "081xm13gvkxg5kv9yhwlxwixcc1wz0vas7arivfhxj81wyl7dwby"; - name = "qtwayland-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz"; + sha256 = "0nwa59g1wk7fkym837pkw312abjb376gx44rpd5d8jv4vphmg852"; + name = "qtwayland-everywhere-src-6.7.2.tar.xz"; }; }; qtwebchannel = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebchannel-everywhere-src-6.7.1.tar.xz"; - sha256 = "0vyc5mfjhsyj147wxg3ldlcn3bm895p961akcc2cw2z9zknrbndr"; - name = "qtwebchannel-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebchannel-everywhere-src-6.7.2.tar.xz"; + sha256 = "072hniyxavz2jjkzh7mrz4g67zf0cngvp4xgdradxrqhgdh9cpdc"; + name = "qtwebchannel-everywhere-src-6.7.2.tar.xz"; }; }; qtwebengine = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebengine-everywhere-src-6.7.1.tar.xz"; - sha256 = "0i6w4783yz58aqxidzaz69k698344fn2h5wm1sdr8zcsc0981w2k"; - name = "qtwebengine-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebengine-everywhere-src-6.7.2.tar.xz"; + sha256 = "1lgz0mj9lw4ii1c8nkbr0ll02xzx8i6n7wvvn21f72sdb5smhxf7"; + name = "qtwebengine-everywhere-src-6.7.2.tar.xz"; }; }; qtwebsockets = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz"; - sha256 = "1szy09vayk5ifd22mpz4zvwwgr5sjz3cawgnaqmcf6dqsbjac5py"; - name = "qtwebsockets-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebsockets-everywhere-src-6.7.2.tar.xz"; + sha256 = "0pr13p6inlh2i79yc567w8dp446rh9xvfakq5diwis4wxkv4mpjv"; + name = "qtwebsockets-everywhere-src-6.7.2.tar.xz"; }; }; qtwebview = { - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebview-everywhere-src-6.7.1.tar.xz"; - sha256 = "0swhdh3xvx82wz337lzwwi34xcq9na9hqnisraqxcd1p7qdqzkk4"; - name = "qtwebview-everywhere-src-6.7.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebview-everywhere-src-6.7.2.tar.xz"; + sha256 = "1zp44kfrks0grc1l6f3ayvfmw45zmhal0pfrzjdw7znl0dlhkqac"; + name = "qtwebview-everywhere-src-6.7.2.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix index 04cda55b30..94dc164651 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-RYZnuHjK6/ygFsjjnOTz7glYnibTwDNlou/4cQ7HfKM="; + sha256 = "sha256-7DaJvpApdnh5+9vd0spUDorwzpzLEaJ8477qE8nJLOc="; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index 816139a169..4cf38eda39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.555"; + version = "1.4.557"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-uBKKgRsM7kUDeF0kMYbo6RjmiU6wq4EEcE94qqMSzt8="; + sha256 = "sha256-RcEkmPMcfNGDmu2bQwUHvlHgM/ySQQwDgf/NpTQMxcI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix index 53994cecd3..a51b675bd9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "biojppm"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-p9XaMsrOgnEdb0yl52HXhNzz6YxuvTD5GCaq1a+l1bQ="; + sha256 = "sha256-VpREG75d+Rmfu8B2VTWueJtfEZwKxGUFb8E3OwVy1L4="; }; nativeBuildInputs = [ cmake git ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index 59494fadfd..5af73735fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -29,8 +29,7 @@ let pname = "faiss"; version = "1.7.4"; - inherit (cudaPackages) cudaFlags backendStdenv; - inherit (cudaFlags) cudaCapabilities dropDot; + inherit (cudaPackages) flags backendStdenv; stdenv = if cudaSupport then backendStdenv else inputs.stdenv; @@ -93,7 +92,7 @@ stdenv.mkDerivation { "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" "-DFAISS_OPT_LEVEL=${optLevel}" ] ++ lib.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 757a1b77da..a675142f36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -41,8 +41,7 @@ let then cudaPackages_11 else cudaPackages; - inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; - inherit (cudaFlags) cudaCapabilities; + inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; # move to newer ROCm version once supported rocmPackages = rocmPackages_5; @@ -52,7 +51,7 @@ let # lists.subtractLists a b = b - a # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; @@ -83,12 +82,11 @@ let throw "No GPU targets specified" ); - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities); - - cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = flags.cmakeCudaArchitecturesString; minArch = let + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities); minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); in # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 4ee82bc063..857b438d22 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-EnpwYtBpY+s5FVI2jhaFHTtAKHeaRlZVnWE/o2T1+FY="; + sha256 = "sha256-WSf4mcZXiEL3nKTLQh3Oi1MxeH9MOFRe7DU5zFT2aQE="; }; makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix deleted file mode 100644 index c07250c660..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchurl -, darwin -, gfortran -, python3 -, blas -, lapack -, mpiSupport ? true -, mpi # generic mpi dependency -, openssh # required for openmpi tests -, petsc-withp4est ? false -, p4est -, zlib # propagated by p4est but required by petsc -, petsc-optimized ? false -, petsc-scalar-type ? "real" -, petsc-precision ? "double" -}: - -# This version of PETSc does not support a non-MPI p4est build -assert petsc-withp4est -> p4est.mpiSupport; - -stdenv.mkDerivation rec { - pname = "petsc"; - version = "3.19.4"; - - src = fetchurl { - url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY="; - }; - - inherit mpiSupport; - withp4est = petsc-withp4est; - - strictDeps = true; - nativeBuildInputs = [ python3 gfortran ] - ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh - ; - buildInputs = [ blas lapack ] - ++ lib.optional withp4est p4est - ; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool - ''; - - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - - preConfigure = '' - patchShebangs ./lib/petsc/bin - configureFlagsArray=( - $configureFlagsArray - ${if !mpiSupport then '' - "--with-mpi=0" - '' else '' - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" - "--with-mpi=1" - ''} - ${lib.optionalString withp4est '' - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ''} - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" - ${lib.optionalString petsc-optimized '' - "--with-debugging=0" - COPTFLAGS='-g -O3' - FOPTFLAGS='-g -O3' - CXXOPTFLAGS='-g -O3' - ''} - ) - ''; - - configureScript = "python ./configure"; - - enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - - meta = with lib; { - description = "Portable Extensible Toolkit for Scientific computation"; - homepage = "https://www.mcs.anl.gov/petsc/index.html"; - license = licenses.bsd2; - maintainers = with maintainers; [ cburstedde ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index 2036c4c862..e9367d416e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -11,7 +11,7 @@ which, }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaFlags; + inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ cuda_cudart.dev # cuda_runtime.h @@ -89,9 +89,7 @@ in doCheck = false; preConfigure = '' - export TCNN_CUDA_ARCHITECTURES="${ - strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) - }" + export TCNN_CUDA_ARCHITECTURES="${flags.cmakeCudaArchitecturesString}" export CUDA_HOME="${cuda-native-redist}" export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" export CC="${backendStdenv.cc}/bin/cc" diff --git a/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix index c7795c3c1c..16e9b47726 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { inherent design complexities and limitations. ''; license = lib.licenses.lgpl2Only; - maintainers = [ lib.maintainers.ivar ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "sdbus-c++-xml2cpp"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix index 21b661338b..a6a9228d44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sexpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sexpp"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "rnpgp"; repo = "sexpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-E1ESN3JKCWYBt1o37d7EVcgARnwGKS6mxua+0m1RMlM="; + hash = "sha256-6PCqzHAb5is8bArQWD5N+GykoWjM8H8mV0IabtNTlYg="; }; buildInputs = [ zlib bzip2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix index d07a841c3c..e2fd827326 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tinyobjloader/tinyobjloader"; description = "Tiny but powerful single file wavefront obj loader"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/toml11/default.nix b/third_party/nixpkgs/pkgs/development/libraries/toml11/default.nix index 641b72aa1e..2747dd4ee3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/toml11/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/toml11/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; }) # TODO [ AndersonTorres ]: tests diff --git a/third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix index f606bdde14..f5058237d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uid_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uid_wrapper"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; - sha256 = "sha256-9+fBveUzUwBRkxQUckRT4U4CrbthSCS2/ifLuYZUt2I="; + sha256 = "sha256-9mB9hketooqW+rg8Sa1y/IPrbTiZHKJ7JJWzWP8Pbew="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix index fd98f419da..9543b49af3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation { pname = "wapp"; - version = "unstable-2023-05-05"; + version = "0-unstable-2024-05-23"; src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/72d0d081e3e6a4aea91ddf429a85cbdf40f9a32d46cccfe81bb75ee50e6cf9cf?at=wapp.tcldir?ci=9d3368116c59ef16"; - hash = "sha256-poG7dvaiOXMi4oWMQ5t3v7SYEqZLUY/TsWXrTL62xd0="; + url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; + hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 10fb01d86d..0e9011778d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -21,7 +21,7 @@ , seatd , vulkan-loader , glslang -, libliftoff +, libliftoff_0_4 , libdisplay-info , nixosTests @@ -125,14 +125,14 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.3"; - hash = "sha256-jth6BKci3sVDC86o+gSHKyDWnibVcNmipm7nn0S6LTg="; + version = "0.17.4"; + hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; extraNativeBuildInputs = [ hwdata ]; extraBuildInputs = [ ffmpeg - libliftoff + libliftoff_0_4 libdisplay-info ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 6f5cac6983..8675bab269 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-ujfXZfBXr3T4e8+bIfkvdvBnEQfW7oPByaiXg/SBwJY="; + hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix b/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix index 168cb66f8c..efa9a1e423 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix @@ -43,4 +43,5 @@ mapAliases { cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16 nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17 + toml = throw "toml was removed because broken. You can use toml-edit instead"; # added 2024-06-25 } diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 6a74f37161..61fab76b98 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -11,7 +11,7 @@ buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/alt-getopt-0.8.0-1.rockspec"; + url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec"; sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210"; }).outPath; src = fetchFromGitHub { @@ -49,6 +49,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT "; }; }) {}; @@ -58,7 +59,7 @@ buildLuarocksPackage { pname = "argparse"; version = "0.7.1-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.7.1-1.rockspec"; + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; }).outPath; src = fetchzip { @@ -225,14 +226,14 @@ buildLuarocksPackage { commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "commons.nvim"; - version = "15.0.2-1"; + version = "18.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/commons.nvim-15.0.2-1.rockspec"; - sha256 = "1n78bgp9y2smnhkjkdvn2c6lq6071k9dml4j6r7hk462hxsbjsqn"; + url = "mirror://luarocks/commons.nvim-18.0.0-1.rockspec"; + sha256 = "073cmh0a1kqzw71ckir8rk6nrhi14rc96vmxzhl4zbfyr3ji05r7"; }).outPath; src = fetchzip { - url = "https://github.com/linrongbin16/commons.nvim/archive/cc17fd28c5f171c5d55f75d668b812e2d70b4cf3.zip"; - sha256 = "0w5z03r59jy3zb653dwp9c6fq8ivjj1j2ksnsx95wlmj1mx04ixi"; + url = "https://github.com/linrongbin16/commons.nvim/archive/75407685b543cdb2263e92366bc4f3c828f4ad69.zip"; + sha256 = "0zm0kjch5rzdkv6faksw16lmhxkil2sdhfl7xvdyc0z830d1k2km"; }; disabled = luaOlder "5.1"; @@ -349,8 +350,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "51649e4a814c05deaf5dde929ba82803f5170bbc"; - hash = "sha256-83F2hFAXHLg4l5O0+j3zbwTv0TaCWEfWErO9C0V9W04="; + rev = "992e573ca58e55ae33c420ea0f620b2daf5fa9c0"; + hash = "sha256-vuRB+0gmwUmFnt+A6m6aa0c54dPZSY4EohHjTcRQRZs="; }; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -390,14 +391,14 @@ buildLuarocksPackage { dkjson = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; - version = "2.7-1"; + version = "2.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/dkjson-2.7-1.rockspec"; - sha256 = "0kgrgyn848hadsfhf2wccamgdpjs1cz7424fjp9vfqzjbwa06lxd"; + url = "mirror://luarocks/dkjson-2.8-1.rockspec"; + sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka"; }).outPath; src = fetchurl { - url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz"; - sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw="; + url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; + hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI="; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -435,14 +436,14 @@ buildLuarocksPackage { fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fidget.nvim"; - version = "1.1.0-1"; + version = "1.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fidget.nvim-1.1.0-1.rockspec"; - sha256 = "0pgjbsqp6bs9kwi0qphihwhl47j1lzdgg3xfa6msikrcf8d7j0hf"; + url = "mirror://luarocks/fidget.nvim-1.4.1-1.rockspec"; + sha256 = "1dfhwa6dgca88h6p9h75qlkcx3qsl8g4aflvndd7vjcimlnfiqqd"; }).outPath; src = fetchzip { - url = "https://github.com/j-hui/fidget.nvim/archive/300018af4abd00610a345e382ca1f4b7ba420f77.zip"; - sha256 = "0bwjcqkb735wqnzc8rngvpq1b2rxgc7m0arjypvnvzsxw6wd1f61"; + url = "https://github.com/j-hui/fidget.nvim/archive/1ba38e4cbb24683973e00c2e36f53ae64da38ef5.zip"; + sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x"; }; disabled = luaOlder "5.1"; @@ -460,7 +461,7 @@ buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec"; + url = "mirror://luarocks/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; src = fetchzip { @@ -528,14 +529,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1243-1"; + version = "0.0.1349-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1243-1.rockspec"; - sha256 = "1qg36v2gx36k313jisxyf6yjywzqngak2qcx211hd2wzxdnsaxdb"; + url = "mirror://luarocks/fzf-lua-0.0.1349-1.rockspec"; + sha256 = "0v9frrq896d3k3xvz0ch51r2chrw4kalp5d2jb365wpnk4zda1lj"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9a0912d171940e8701d1f65d5ee2b23b810720c1.zip"; - sha256 = "0xzgpng4r9paza87fnxc3cfn331g1pmcayv1vky7jmriy5xsrxh6"; + url = "https://github.com/ibhagwan/fzf-lua/archive/1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4.zip"; + sha256 = "0iw3khl164qvypm7v591gyncjfpmwx6wy45a80zz922iiifgjfgd"; }; disabled = luaOlder "5.1"; @@ -579,8 +580,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "035da036e68e509ed158414416c827d022d914bd"; - hash = "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw="; + rev = "17e8fd66182c9ad79dc129451ad015af3d27529c"; + hash = "sha256-Mq3NC/DpEEOZlgKctjQqa1RMJHVSAy6jfL4IitObgzs="; }; disabled = lua.luaversion != "5.1"; @@ -595,14 +596,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.8-1"; + version = "3.1.10-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.8-1.rockspec"; - sha256 = "1jhms5gpah8lk0mn1gx127afmihyaq1fj8qrd6a8yh3wy12k1qxc"; + url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; + sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.8.zip"; - sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; + sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; }; disabled = luaOlder "5.1"; @@ -642,14 +643,14 @@ buildLuarocksPackage { image-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, magick }: buildLuarocksPackage { pname = "image.nvim"; - version = "1.2.0-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec"; - sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508"; + url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec"; + sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9"; }).outPath; src = fetchzip { - url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip"; - sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; + url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip"; + sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr"; }; disabled = luaOlder "5.1"; @@ -1108,7 +1109,7 @@ buildLuarocksPackage { pname = "lua-ffi-zlib"; version = "0.6-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-ffi-zlib-0.6-0.rockspec"; + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; }).outPath; src = fetchFromGitHub { @@ -1153,7 +1154,7 @@ buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-lsp-0.1.0-2.rockspec"; + url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec"; sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; }).outPath; src = fetchFromGitHub { @@ -1198,16 +1199,16 @@ buildLuarocksPackage { lua-protobuf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.5.1-1"; + version = "0.5.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.5.1-1.rockspec"; - sha256 = "1ljn0xwrhcr49k4fzrh0g1q13j16sa6h3wd5q62995q4jlrmnhja"; + url = "mirror://luarocks/lua-protobuf-0.5.2-1.rockspec"; + sha256 = "0vi916qn0rbc2xhlf766vja403hwikkglza879yxm77j4n7ywrqb"; }).outPath; src = fetchFromGitHub { owner = "starwing"; repo = "lua-protobuf"; - rev = "0.5.1"; - hash = "sha256-Di4fahYlTFfJ2xM6KMs5BY44JV7IKBxxR345uk8X9W8="; + rev = "0.5.2"; + hash = "sha256-8x6FbaSUcwI1HiVvCr/726CgQSUxkUWqTNJH9pRLbJ0="; }; disabled = luaOlder "5.1"; @@ -1297,16 +1298,16 @@ buildLuarocksPackage { lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.3.1-1"; + version = "1.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.3.1-1.rockspec"; - sha256 = "1rqsmsnnnz78yb0x2xf7764l3rk54ngk3adm6an4g7dm5kryv33f"; + url = "mirror://luarocks/lua-resty-openssl-1.4.0-1.rockspec"; + sha256 = "027fqpbhq0ygh9z7za2hv7wm6ylll8km4czvjfclscm4p55bj10q"; }).outPath; src = fetchFromGitHub { owner = "fffonion"; repo = "lua-resty-openssl"; - rev = "1.3.1"; - hash = "sha256-4h6oIdiMyW9enJToUBtRuUdnKSyWuFFxIDvj4dFRKDs="; + rev = "1.4.0"; + hash = "sha256-gmsKpt42hgjqhzibYXbdWyj2MqOyC8FlhMY7xiXdtFQ="; }; @@ -1553,16 +1554,16 @@ buildLuarocksPackage { luacheck = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.2-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.2-1.rockspec"; - sha256 = "11p7kf7v1b5rhi3m57g2zqwzmnnp79v76gh13b0fg2c78ljkq1k9"; + url = "mirror://luarocks/luacheck-1.2.0-1.rockspec"; + sha256 = "0jnmrppq5hp8cwiw1daa33cdn8y2n5lsjk8vzn7ixb20ddz01m6c"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luacheck"; - rev = "v1.1.2"; - hash = "sha256-AUEHRuldlnuxBWGRzcbjM4zu5IBGfbNEUakPmpS4VIo="; + rev = "v1.2.0"; + hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY="; }; disabled = luaOlder "5.1"; @@ -1628,7 +1629,7 @@ buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.3-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.3-1.rockspec"; + url = "mirror://luarocks/luadbi-mysql-0.7.3-1.rockspec"; sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3"; }).outPath; src = fetchFromGitHub { @@ -1889,6 +1890,30 @@ buildLuarocksPackage { }; }) {}; +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaposix"; + version = "34.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; + sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; + }).outPath; + src = fetchzip { + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ bit32 ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + maintainers = with lib.maintainers; [ vyp lblasc ]; + license.fullName = "MIT/X11"; + }; +}) {}; + luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luaprompt"; @@ -1910,30 +1935,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/dpapavas/luaprompt"; description = "A Lua command prompt with pretty-printing and auto-completion"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaposix"; - version = "34.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; - sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; - }).outPath; - src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; - sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; - }; - - disabled = luaOlder "5.1" || luaAtLeast "5.4"; - propagatedBuildInputs = [ bit32 ]; - - meta = { - homepage = "http://github.com/luaposix/luaposix/"; - description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT/X11"; }; }) {}; @@ -1963,16 +1965,16 @@ buildLuarocksPackage { luarocks = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks"; - version = "3.11.0-1"; + version = "3.11.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-3.11.0-1.rockspec"; - sha256 = "0pi55445dskpw6nhrq52589h4v39fsf23c0kp8d4zg2qaf6y2n38"; + url = "mirror://luarocks/luarocks-3.11.1-1.rockspec"; + sha256 = "0xg0siza8nlnnkaarmw73q12qx3frlfbysd5ipmxxi1d7yc38bbn"; }).outPath; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v3.11.0"; - hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; + rev = "v3.11.1"; + hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; }; @@ -2008,21 +2010,21 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }: +luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "2.0.0-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec"; - sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; + sha256 = "0r3r8dvjn9zvpj06932ijqwypq636zv2vpq5pcj83xfvvi3fd2rw"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip"; - sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; + sha256 = "1838q30n2xjb8cmhlzxax0kzvxhsdrskkk4715kkca8zk6i3zm98"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luafilesystem ]; meta = { homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser"; @@ -2158,16 +2160,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.3.0-2"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.3.0-2.rockspec"; - sha256 = "02kwkcwf81v6ncxl1ng2pxlhalz78q2476snh5xxv3wnwqwbp10a"; + url = "mirror://luarocks/luasystem-0.4.0-1.rockspec"; + sha256 = "0brvqqxfz1w4l4nzaxds1d17flq7rx6lw8pjb565fyb2jhg39qc9"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.3.0"; - hash = "sha256-oTFH0x94gSo1sqk1GsDheoVrjJHxFWZLtlJ45GwupoU="; + rev = "v0.4.0"; + hash = "sha256-I1dG6ccOQAwpe18DjiYijKjerk+yDRic6fEERSte2Ks="; }; disabled = luaOlder "5.1"; @@ -2391,14 +2393,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "1.3.2-1"; + version = "1.4.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-1.3.2-1.rockspec"; - sha256 = "00zcqswjs9xwwh6llkair896l2ikh3m8pgfkd38qaqyv0h27jql9"; + url = "mirror://luarocks/lz.n-1.4.2-1.rockspec"; + sha256 = "1jvmp35c5n43frk0bkpgfd9p76p9f5zy094ybzanydz9d6p5d7c4"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v1.3.2.zip"; - sha256 = "1lpk124k1xd76kb1wpxr9r71way3hprjqrqfiyip1p1cgznw3zp9"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.2.zip"; + sha256 = "0g2gghw7i71sm9szw772pwhwy73nfx4lx1x0393hjl7cx95r885b"; }; disabled = luaOlder "5.1"; @@ -2573,14 +2575,14 @@ buildLuarocksPackage { neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.2.3-1"; + version = "5.3.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.2.3-1.rockspec"; - sha256 = "16pwkwv2dmi9aqhp6bdbgwhksi891iz73rvksqmv136jx6fi7za1"; + url = "mirror://luarocks/neotest-5.3.3-1.rockspec"; + sha256 = "0bji9bfh129l9find3asakr97pxq76gdjp96gyibv02m4j0hgqjz"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/5caac5cc235d495a2382bc2980630ef36ac87032.zip"; - sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; + url = "https://github.com/nvim-neotest/neotest/archive/f30bab1faef13d47f3905e065215c96a42d075ad.zip"; + sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; }; disabled = luaOlder "5.1"; @@ -2649,8 +2651,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3"; - hash = "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE="; + rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; + hash = "sha256-7tEfEjWH5pneI10jLYpenoysRQPa2zPGLTNcbMX3x2I="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2665,14 +2667,14 @@ buildLuarocksPackage { nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; - version = "1.9.0-1"; + version = "1.9.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-nio-1.9.0-1.rockspec"; - sha256 = "0hwjkz0pjd8dfc4l7wk04ddm8qzrv5m15gskhz9gllb4frnk6hik"; + url = "mirror://luarocks/nvim-nio-1.9.4-1.rockspec"; + sha256 = "05xccwawl82xjwxmpihb6v4l7sp0msc6hhgs8mgzbsclznf78052"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.9.0.zip"; - sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + url = "https://github.com/nvim-neotest/nvim-nio/archive/7969e0a8ffabdf210edd7978ec954a47a737bbcc.zip"; + sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; }; disabled = luaOlder "5.1"; @@ -2708,13 +2710,13 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: +penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "penlight"; - version = "1.14.0-1"; + version = "1.14.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/penlight-1.14.0-1.rockspec"; - sha256 = "1zmibf0pgcnf0lj1xmxs0srbyy1cswvb9g1jajy9lhicnpqqlgvh"; + url = "mirror://luarocks/penlight-1.14.0-2.rockspec"; + sha256 = "0gs07q81mkrk9i0hhqvd8nf5vzmv540ch2hiw4rcqg18vbyincq7"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; @@ -2723,7 +2725,6 @@ buildLuarocksPackage { hash = "sha256-4zAt0GgQEkg9toaUaDn3ST3RvjLUDsuOzrKi9lhq0fQ="; }; - disabled = luaOlder "5.1"; propagatedBuildInputs = [ luafilesystem ]; meta = { @@ -2742,8 +2743,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; - hash = "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8="; + rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; + hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2829,14 +2830,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "1.5.0-1"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-1.5.0-1.rockspec"; - sha256 = "14rj1p7grmdhi3xm683c3c441xxcldhi5flh6lg1fab1rm9mij6b"; + url = "mirror://luarocks/rocks-config.nvim-2.0.0-1.rockspec"; + sha256 = "0vkzhz6szbm6cy4301c103kck36zgk8ig2ssipclca392cq36716"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.5.0.zip"; - sha256 = "0kpvd9ddj1vhkz54ckqsym4fbj1krzpp8cslb20k8qk2n1ccjynv"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.0.0.zip"; + sha256 = "1gzpcvb79s8a0mxq331fhwgik4bkaj254avri50wm1y5qxb4n3nx"; }; disabled = luaOlder "5.1"; @@ -2850,21 +2851,21 @@ buildLuarocksPackage { }; }) {}; -rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }: +rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.1.2-1"; + version = "1.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.1.2-1.rockspec"; - sha256 = "09yz84akkparvqfsjpslxpv3wzvkjrbqil8fxwl5crffggn5mz1b"; + url = "mirror://luarocks/rocks-dev.nvim-1.2.3-1.rockspec"; + sha256 = "0xhl0rmklhhlcsn268brj7hhl5lk2djhkllzna2rnjaq80cwsh5j"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.1.2.zip"; - sha256 = "19g8dlz2zch0sz21zm92l6ic81bx68wklidjw94xrjyv26139akc"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.2.3.zip"; + sha256 = "17sv49wl366jxriy0cxy3b1z8vans58jmjg4ap5dc9fmg6687jgs"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua nvim-nio rocks-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio rocks-nvim rtp-nvim ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim"; @@ -2877,14 +2878,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "1.4.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-1.4.0-1.rockspec"; - sha256 = "04zx6yvp5pg306wqaw6fymqci5qnzpzg27xjrycflcyxxq4xmnmg"; + url = "mirror://luarocks/rocks-git.nvim-1.5.1-1.rockspec"; + sha256 = "0if5vaxggf4ryik5szm1p5dv324sybm9h3jbpl78ydd1kf0702m6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.4.0.zip"; - sha256 = "0yjigf9pzy53yylznnnb68dwmylx9a3qv84kdc2whsf4cj23m2nj"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.5.1.zip"; + sha256 = "05g31js2k2jjrz0a633vdfz21ji1a2by79yrfhi6wdmp167a5w99"; }; disabled = luaOlder "5.1"; @@ -2898,21 +2899,21 @@ buildLuarocksPackage { }; }) {}; -rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, nvim-nio, rtp-nvim, toml-edit }: +rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.26.0-1"; + version = "2.31.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.26.0-1.rockspec"; - sha256 = "1piypyxq1c6l203f3w8z4fhfi649h5ppl58lckvxph9dvidg11lf"; + url = "mirror://luarocks/rocks.nvim-2.31.3-1.rockspec"; + sha256 = "1rrsshsi6c5njcyaibz1mdvhyjl4kf2973kwahyk84j52fmwzwjv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.26.0.zip"; - sha256 = "10wck99dfwxv49pkd9pva7lqr4a79zccbqvb75qbxkgnj0yd5awc"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.31.3.zip"; + sha256 = "07500g0jvicbxqmsqdb3dcjpmvd6wgwk8g34649f94nhqk3lglx5"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ fidget-nvim fzy nvim-nio rtp-nvim toml-edit ]; + propagatedBuildInputs = [ fidget-nvim fzy luarocks nvim-nio rtp-nvim toml-edit ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; @@ -2922,8 +2923,7 @@ buildLuarocksPackage { }; }) {}; - -rtp-nvim = callPackage ({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; version = "1.0.0-1"; @@ -2941,6 +2941,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rtp.nvim"; description = "Source plugin and ftdetect directories on the Neovim runtimepath."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; }) {}; @@ -2948,14 +2949,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.22.8-1"; + version = "4.25.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.22.8-1.rockspec"; - sha256 = "18hghs9v9j3kv3fxwdp7qk9vhbxn4c8xd8pyxwnyjq5ad7ninr82"; + url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; + sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.22.8.zip"; - sha256 = "1n9kqr8xdqamc8hd8a155h7rzyda8bz39n0zdgdw0j8hqc214vmm"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; + sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; }; disabled = luaOlder "5.1"; @@ -2997,8 +2998,8 @@ buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/serpent-0.30-2.rockspec"; - sha256 = "01696wwp1m8jlcj0y1wwscnz3cpcjdvm8pcnc6c6issa2s4544vr"; + url = "mirror://luarocks/serpent-0.30-2.rockspec"; + sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; }).outPath; src = fetchFromGitHub { owner = "pkulchenko"; @@ -3136,14 +3137,14 @@ buildLuarocksPackage { telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "1.0.2-1"; + version = "1.0.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-1.0.2-1.rockspec"; - sha256 = "0a5cg3kx2pv8jsr0jdpxd1ahprh55n12ggzlqiailyyskzpx94bl"; + url = "mirror://luarocks/telescope-manix-1.0.3-1.rockspec"; + sha256 = "0avqlglmki244q3ffnlc358z3pn36ibcqysxrxw7h6qy1zcwm8sr"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.2.zip"; - sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; + url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.3.zip"; + sha256 = "186rbdddpv8q0zcz18lnkarp0grdzxp80189n4zj2mqyzqnw0svj"; }; disabled = luaOlder "5.1"; @@ -3167,8 +3168,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "35f94f0ef32d70e3664a703cefbe71bd1456d899"; - hash = "sha256-AtvZ7b2bg+Iaei4rRzTBYf76vHJH2Yq5tJAJZrZw/pk="; + rev = "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed"; + hash = "sha256-0fS3RYO/9gwmdK2H9Y/4Z/P++4aEHTHJqR2mH0vWAFY="; }; disabled = lua.luaversion != "5.1"; @@ -3232,39 +3233,6 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "toml"; - version = "0.3.0-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-0.3.0-0.rockspec"; - sha256 = "0y4qdzsvf4xwnr49xcpbqclrq9d6snv83cbdkrchl0cn4cx6zpxy"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/LebJe/toml.lua.git", - "rev": "319e9accf8c5cedf68795354ba81e54c817d1277", - "date": "2023-02-19T23:00:49-05:00", - "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", - "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", - "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/LebJe/toml.lua"; - description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++."; - maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "MIT"; - }; -}) {}; - toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; @@ -3289,7 +3257,7 @@ buildLuarocksPackage { }; }) {}; -tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }: buildLuarocksPackage { pname = "tree-sitter-norg"; version = "0.2.4-1"; @@ -3302,10 +3270,12 @@ buildLuarocksPackage { sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd"; }; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; meta = { homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; description = "The official tree-sitter parser for Norg documents."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; @@ -3361,16 +3331,16 @@ buildLuarocksPackage { xml2lua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "xml2lua"; - version = "1.5-2"; + version = "1.6-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/xml2lua-1.5-2.rockspec"; - sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h"; + url = "mirror://luarocks/xml2lua-1.6-2.rockspec"; + sha256 = "1fh57kv95a18q4869hmr4fbzbnlmq5z83mkkixvwzg3szf9kvfcn"; }).outPath; src = fetchFromGitHub { owner = "manoelcampos"; repo = "xml2lua"; - rev = "v1.5-2"; - hash = "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4="; + rev = "v1.6-2"; + hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0="; }; disabled = luaOlder "5.1"; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index 34338bf96b..99fe9217c9 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -326,11 +326,15 @@ in ''; }); + lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: { + meta = oa.meta // { broken = true; }; + }); + lua-zlib = prev.lua-zlib.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ zlib.dev ]; - meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; + meta = oa.meta // { broken = luaOlder "5.1" || luaAtLeast "5.4"; }; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { @@ -787,19 +791,6 @@ in nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); - toml = prev.toml.overrideAttrs (oa: { - patches = [ ./toml.patch ]; - - nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ]; - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \ - --replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum" - ''; - }); - toml-edit = prev.toml-edit.overrideAttrs (oa: { cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix index b141c22a0a..43ecfed6d2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -50,11 +50,14 @@ mapAliases { "@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22 + "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15 + "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 + inherit (pkgs) auto-changelog; # added 2024-06-25 inherit (pkgs) aws-azure-login; # added 2023-09-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 inherit (pkgs) bash-language-server; # added 2024-06-07 @@ -74,17 +77,24 @@ mapAliases { inherit (pkgs) create-react-app; # added 2023-09-25 dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 + inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 + inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 + inherit (pkgs) fixjson; # added 2024-06-26 flood = pkgs.flood; # Added 2023-07-25 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 + inherit (pkgs) git-run; # added 2024-06-26 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) git-standup; # added 2024-06-26 inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 + inherit (pkgs) get-graphql-schema; # added 2024-06-26 inherit (pkgs) gqlint; # added 2023-08-19 + inherit (pkgs) gramma; # added 2024-06-26 inherit (pkgs) graphite-cli; # added 2024-01-25 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 @@ -103,6 +113,7 @@ mapAliases { karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 manta = pkgs.node-manta; # Added 2023-05-06 + inherit (pkgs) markdown-link-check; # added 2024-06-28 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 inherit (pkgs) mathjax-node-cli; # added 2023-11-02 @@ -111,11 +122,13 @@ mapAliases { musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 parcel-bundler = parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 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) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 @@ -158,6 +171,7 @@ mapAliases { triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 inherit (pkgs) ungit; # added 2023-08-20 + inherit (pkgs) vim-language-server; # added 2024-06-25 inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-cli = self."@vue/cli"; # added 2023-08-18 diff --git a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix index 20102095ff..3f73129037 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -30,7 +30,6 @@ fauna-shell = "fauna"; fkill-cli = "fkill"; fleek-cli = "fleek"; - git-run = "gr"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix index 5400fc6358..bc1e36628a 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix @@ -109,7 +109,7 @@ let ); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }: + composePackage = { name, packageName, src, dependencies ? [], ... }@args: builtins.addErrorContext "while evaluating node package '${packageName}'" '' installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} @@ -194,7 +194,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: '' if [ -d "${packageName}" ] then @@ -496,7 +496,7 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in - stdenv.mkDerivation (finalAttrs: { + stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -508,9 +508,8 @@ let inherit dontStrip; # Stripping may fail a build for some package deployments inherit dontNpmInstall preRebuild unpackPhase buildPhase; - # TODO: enable overriding dependencies too? - compositionScript = composePackage { inherit packageName dependencies; inherit (finalAttrs) name src; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage { inherit packageName dependencies production; }; + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index b2e0bf0ca2..295fdef57f 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -12,7 +12,6 @@ , "@tailwindcss/line-clamp" , "@tailwindcss/typography" , "@uppy/companion" -, "@volar/vue-language-server" , "@vue/cli" , {"@webassemblyjs/cli": "1.11.1"} , {"@webassemblyjs/repl": "1.11.1"} @@ -22,7 +21,6 @@ , "alex" , "audiosprite" , "autoprefixer" -, "auto-changelog" , "aws-cdk" , "awesome-lint" , "bower" @@ -90,9 +88,7 @@ , "cspell" , "csslint" , "dhcp" -, "diagnostic-languageserver" , "diff2html-cli" -, "dotenv-cli" , "dotenv-vault" , "elasticdump" , "@electron-forge/cli" @@ -106,18 +102,13 @@ , "expo-cli" , "fast-cli" , "fauna-shell" -, "fixjson" , "fkill-cli" , "fleek-cli" , "forever" , "fx" , "ganache" , "gatsby-cli" -, "get-graphql-schema" -, "git-run" -, "git-standup" , "@gitbeaker/cli" -, "gramma" , "grammarly-languageserver" , "graphql" , "graphql-cli" @@ -159,7 +150,6 @@ , "lua-fmt" , "lv_font_conv" , "madoko" -, "markdown-link-check" , "mastodon-bot" , "mathjax" , "meat" @@ -172,7 +162,6 @@ , "node-pre-gyp" , "node-red" , "node2nix" -, "nodemon" , "np" , "npm" , "npm-merge-driver" @@ -183,7 +172,6 @@ , "patch-package" , "peerflix" , "peerflix-server" -, "pnpm" , "poor-mans-t-sql-formatter-cli" , "postcss" , "postcss-cli" @@ -268,7 +256,6 @@ , "vega-cli" , "vega-lite" , "vercel" -, "vim-language-server" , "vls" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index c8ffc441ad..5c56659036 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -31,15 +31,6 @@ let sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="; }; }; - "@adobe/css-tools-4.3.3" = { - name = "_at_adobe_slash_css-tools"; - packageName = "@adobe/css-tools"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz"; - sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="; - }; - }; "@akryum/winattr-3.0.0" = { name = "_at_akryum_slash_winattr"; packageName = "@akryum/winattr"; @@ -76,31 +67,31 @@ let sha512 = "30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="; }; }; - "@angular-devkit/architect-0.1800.2" = { + "@angular-devkit/architect-0.1800.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1800.2"; + version = "0.1800.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1800.2.tgz"; - sha512 = "PX7lCTAqWe9C40+fie+DAc8vhpGA+JgZKWWrMHUTV/iZx8RXx2X4xGQsqYu36p4i3MSfQdbn+0xLWGmjScPVOQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1800.4.tgz"; + sha512 = "82TKhYnSO8aGIBo5TxPtyUQnZFcbV+qB2bIIYOAKsJgxAVxLeFD6QA6gTmHOZPXw5pBEPUO/+PUwq+Uk5xesgw=="; }; }; - "@angular-devkit/core-18.0.2" = { + "@angular-devkit/core-18.0.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "18.0.2"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.2.tgz"; - sha512 = "QXcEdfmODc0rKblBerk30yw70fypIkFm6gQBLJgsshpwc+TMA+fuMLcPQebOTzKLtD2tNUkk/7SrWPQIGqeXaA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.4.tgz"; + sha512 = "8vYvJ5FF2NjFUia00hv8KWakOjOZ+09PbnNqd+lntJBekIg1lHDOF/vNMlVHtU5LiE1aNi9P/69/VXTckPfU9g=="; }; }; - "@angular-devkit/schematics-18.0.2" = { + "@angular-devkit/schematics-18.0.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "18.0.2"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.2.tgz"; - sha512 = "G9yGcoB67sH0eRNWoiQWNn2KwiI7sDasVscYPGKf1yo7JRiXmzX/LpfKRPsZTl+Bs0FItnwDInsqgMisK89/6g=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.4.tgz"; + sha512 = "hCHmuu/Z1teOQPx1AMJa/gcK6depk+XgU5dIpEvflC+ApW3hglNe2QKaqajDZ+34s+PKAVWa86M8IOV7o/mHuA=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -373,6 +364,15 @@ let sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; }; }; + "@aws-crypto/crc32-5.2.0" = { + name = "_at_aws-crypto_slash_crc32"; + packageName = "@aws-crypto/crc32"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz"; + sha512 = "nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg=="; + }; + }; "@aws-crypto/crc32c-3.0.0" = { name = "_at_aws-crypto_slash_crc32c"; packageName = "@aws-crypto/crc32c"; @@ -382,6 +382,15 @@ let sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; }; }; + "@aws-crypto/crc32c-5.2.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz"; + sha512 = "+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag=="; + }; + }; "@aws-crypto/ie11-detection-3.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -400,6 +409,15 @@ let sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; }; }; + "@aws-crypto/sha1-browser-5.2.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz"; + sha512 = "OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg=="; + }; + }; "@aws-crypto/sha256-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -409,6 +427,15 @@ let sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; }; }; + "@aws-crypto/sha256-browser-5.2.0" = { + name = "_at_aws-crypto_slash_sha256-browser"; + packageName = "@aws-crypto/sha256-browser"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz"; + sha512 = "AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw=="; + }; + }; "@aws-crypto/sha256-js-3.0.0" = { name = "_at_aws-crypto_slash_sha256-js"; packageName = "@aws-crypto/sha256-js"; @@ -418,6 +445,15 @@ let sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; }; }; + "@aws-crypto/sha256-js-5.2.0" = { + name = "_at_aws-crypto_slash_sha256-js"; + packageName = "@aws-crypto/sha256-js"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz"; + sha512 = "FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA=="; + }; + }; "@aws-crypto/supports-web-crypto-3.0.0" = { name = "_at_aws-crypto_slash_supports-web-crypto"; packageName = "@aws-crypto/supports-web-crypto"; @@ -427,6 +463,15 @@ let sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; }; }; + "@aws-crypto/supports-web-crypto-5.2.0" = { + name = "_at_aws-crypto_slash_supports-web-crypto"; + packageName = "@aws-crypto/supports-web-crypto"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz"; + sha512 = "iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg=="; + }; + }; "@aws-crypto/util-3.0.0" = { name = "_at_aws-crypto_slash_util"; packageName = "@aws-crypto/util"; @@ -436,6 +481,15 @@ let sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; + "@aws-crypto/util-5.2.0" = { + name = "_at_aws-crypto_slash_util"; + packageName = "@aws-crypto/util"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz"; + sha512 = "4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ=="; + }; + }; "@aws-sdk/abort-controller-3.296.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; @@ -472,13 +526,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.588.0" = { + "@aws-sdk/client-s3-3.598.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.588.0.tgz"; - sha512 = "MyJs3sbgRtVOdT2xxdg/CmLk+t+dMg26nfEZucBFeJKFAHfTA74sjef9y+GQ2xFUNq+kqG1CnP8JGMiGx2ht0w=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.598.0.tgz"; + sha512 = "UMxftsgF6j1vzm4Qd9vQJHs2he1NQCWWV8esZfmNFq23OpUC2BPMxkqi13ZQ9tnTAZUNs7yFT/x4Zsi/wpRZEw=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -490,13 +544,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.588.0" = { + "@aws-sdk/client-sso-3.598.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.588.0.tgz"; - sha512 = "zKS+xUkBLfwjbh77ZjtRUoG/vR/fyDteSE6rOAzwlmHQL8p+QUX+zNUNvCInvPi62zGBhEwXOvzs8zvnT4NzfQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz"; + sha512 = "nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -508,13 +562,13 @@ let sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw=="; }; }; - "@aws-sdk/client-sso-oidc-3.588.0" = { + "@aws-sdk/client-sso-oidc-3.598.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.588.0.tgz"; - sha512 = "CTbgtLSg0y2jIOtESuQKkRIqRe/FQmKuyzFWc+Qy6yGcbk1Pyusfz2BC+GGwpYU+1BlBBSNnLQHpx3XY87+aSA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz"; + sha512 = "jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg=="; }; }; "@aws-sdk/client-sts-3.296.0" = { @@ -526,13 +580,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.588.0" = { + "@aws-sdk/client-sts-3.598.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.588.0.tgz"; - sha512 = "UIMjcUikgG9NIENQxSyJNTHMD8TaTfK6Jjf1iuZSyQRyTrcGy0/xcDxrmwZQFAPkOPUf6w9KqydLkMLcYOBdPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz"; + sha512 = "bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -544,13 +598,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.588.0" = { + "@aws-sdk/core-3.598.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.588.0.tgz"; - sha512 = "O1c2+9ce46Z+iiid+W3iC1IvPbfIo5ev9CBi54GdNB9SaI8/3+f8MJcux0D6c9toCF0ArMersN/gp8ek57e9uQ=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.598.0.tgz"; + sha512 = "HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -562,22 +616,22 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.587.0" = { + "@aws-sdk/credential-provider-env-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.587.0.tgz"; - sha512 = "Hyg/5KFECIk2k5o8wnVEiniV86yVkhn5kzITUydmNGCkXdBFHMHRx6hleQ1bqwJHbBskyu8nbYamzcwymmGwmw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz"; + sha512 = "vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w=="; }; }; - "@aws-sdk/credential-provider-http-3.587.0" = { + "@aws-sdk/credential-provider-http-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-http"; packageName = "@aws-sdk/credential-provider-http"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.587.0.tgz"; - sha512 = "Su1SRWVRCuR1e32oxX3C1V4c5hpPN20WYcRfdcr2wXwHqSvys5DrnmuCC+JoEnS/zt3adUJhPliTqpfKgSdMrA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz"; + sha512 = "N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -598,13 +652,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.588.0" = { + "@aws-sdk/credential-provider-ini-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.588.0.tgz"; - sha512 = "tP/YmEKvYpmp7pCR2OuhoOhAOtm6BbZ1hbeG9Sw9RFZi55dbGPHqMmfvvzHFAGsJ20z4/oDS+UnHaWVhRnV82w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz"; + sha512 = "/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -616,13 +670,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.588.0" = { + "@aws-sdk/credential-provider-node-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.588.0.tgz"; - sha512 = "8s4Ruo6q1YIrj8AZKBiUQG42051ytochDMSqdVOEZGxskfvmt2XALyi5SsWd0Ve3zR95zi+EtRBNPn2EU8sQpA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz"; + sha512 = "sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -634,13 +688,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.587.0" = { + "@aws-sdk/credential-provider-process-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.587.0.tgz"; - sha512 = "V4xT3iCqkF8uL6QC4gqBJg/2asd/damswP1h9HCfqTllmPWzImS+8WD3VjgTLw5b0KbTy+ZdUhKc0wDnyzkzxg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz"; + sha512 = "rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -652,13 +706,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.588.0" = { + "@aws-sdk/credential-provider-sso-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.588.0.tgz"; - sha512 = "1GstMCyFzenVeppK7hWazMvo3P1DXKP70XkXAjH8H2ELBVg5X8Zt043cnQ7CMt4XjCV+ettHAtc9kz/gJTkDNQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz"; + sha512 = "5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -670,13 +724,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.587.0" = { + "@aws-sdk/credential-provider-web-identity-3.598.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.587.0.tgz"; - sha512 = "XqIx/I2PG7kyuw3WjAP9wKlxy8IvFJwB8asOFT1xPFoVfZYKIogjG9oLP5YiRtfvDkWIztHmg5MlVv3HdJDGRw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz"; + sha512 = "GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -778,13 +832,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.588.0" = { + "@aws-sdk/lib-storage-3.598.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.588.0.tgz"; - sha512 = "NwGw5XWxUnBRdUg08PoNN7XWF+N9lzbCBTRRmxV8FTJnzqiJEYkb4GKv5GeaeeL5Wp4qtMLMwunCxM4rhx2fsg=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.598.0.tgz"; + sha512 = "la1ZY8MHH6oGUZ6nocl+2ebGNhkzgE15dB5iC0ZPHjfW0aNEfcrF2crGVxnkJQFv0LeDPQN26drajlmLnq86UA=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -805,13 +859,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.587.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.598.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.587.0.tgz"; - sha512 = "HkFXLPl8pr6BH/Q0JpOESqEKL0ZK3sk7aSZ1S6GE4RXET7H5R94THULXqQFZzD48gZcyFooO/yNKZTqrZFaWKg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.598.0.tgz"; + sha512 = "PM7BcFfGUSkmkT6+LU9TyJiB4S8yI7dfuKQDwK5ZR3P7MKaK4Uj4yyDiv0oe5xvkF6+O2+rShj+eh8YuWkOZ/Q=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -841,13 +895,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.577.0" = { + "@aws-sdk/middleware-expect-continue-3.598.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.577.0.tgz"; - sha512 = "6dPp8Tv4F0of4un5IAyG6q++GrRrNQQ4P2NAMB1W0VO4JoEu1C8GievbbDLi88TFIFmtKpnHB0ODCzwnoe8JsA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.598.0.tgz"; + sha512 = "ZuHW18kaeHR8TQyhEOYMr8VwiIh0bMvF7J1OTqXHxDteQIavJWA3CbfZ9sgS4XGtrBZDyHJhjZKeCfLhN2rq3w=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -859,13 +913,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.587.0" = { + "@aws-sdk/middleware-flexible-checksums-3.598.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.587.0.tgz"; - sha512 = "URMwp/budDvKhIvZ4a6zIBfFTun/iDlPWXqsGKYjEtHt8jz27OSjCZtDtIeqW4WTBdKL8KZgQcl+DdaE5M1qiQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.598.0.tgz"; + sha512 = "xukAzds0GQXvMEY9G6qt+CzwVzTx8NyKKh04O2Q+nOch6QQ8Rs+2kTRy3Z4wQmXq2pK9hlOWb5nXA7HWpmz6Ng=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -877,13 +931,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.577.0" = { + "@aws-sdk/middleware-host-header-3.598.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz"; - sha512 = "9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz"; + sha512 = "WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -895,13 +949,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.577.0" = { + "@aws-sdk/middleware-location-constraint-3.598.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.577.0.tgz"; - sha512 = "DKPTD2D2s+t2QUo/IXYtVa/6Un8GZ+phSTBkyBNx2kfZz4Kwavhl/JJzSqTV3GfCXkVdFu7CrjoX7BZ6qWeTUA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.598.0.tgz"; + sha512 = "8oybQxN3F1ISOMULk7JKJz5DuAm5hCUcxMW9noWShbxTJuStNvuHf/WLUzXrf8oSITyYzIHPtf8VPlKR7I3orQ=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -913,13 +967,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.577.0" = { + "@aws-sdk/middleware-logger-3.598.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz"; - sha512 = "aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz"; + sha512 = "bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -931,13 +985,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.577.0" = { + "@aws-sdk/middleware-recursion-detection-3.598.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz"; - sha512 = "pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz"; + sha512 = "vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -958,13 +1012,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.587.0" = { + "@aws-sdk/middleware-sdk-s3-3.598.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.587.0.tgz"; - sha512 = "vtXTGEiw1E9Fax4LmcU2Z208gbrC8ShrdsSLmGcRPpu5NPOGBFBSDG5sy5EDNClrFxIl/Le8coQnD0EDBtx+uQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.598.0.tgz"; + sha512 = "5AGtLAh9wyK6ANPYfaKTqJY1IFJyePIxsEbxa7zS6REheAqyVmgJFaGu3oQ5XlxfGr5Uq59tFTRkyx26G1HkHA=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -994,13 +1048,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.587.0" = { + "@aws-sdk/middleware-signing-3.598.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.587.0.tgz"; - sha512 = "tiZaTDj4RvhXGRAlncFn7CSEfL3iNPO67WSaxAq+Ls5j1VgczPhu5262cWONNoMgth3nXR1hhLC4ITSl/a6AzA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.598.0.tgz"; + sha512 = "XKb05DYx/aBPqz6iCapsCbIl8aD8EihTuPCs51p75QsVfbQoVr4TlFfIl5AooMSITzojdAQqxt021YtvxjtxIQ=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -1012,13 +1066,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.577.0" = { + "@aws-sdk/middleware-ssec-3.598.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.577.0.tgz"; - sha512 = "i2BPJR+rp8xmRVIGc0h1kDRFcM2J9GnClqqpc+NLSjmYadlcg4mPklisz9HzwFVcRPJ5XcGf3U4BYs5G8+iTyg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.598.0.tgz"; + sha512 = "f0p2xP8IC1uJ5e/tND1l81QxRtRFywEdnbtKCE0H6RSn4UIt2W3Dohe1qQDbnh27okF0PkNW6BJGdSAz3p7qbA=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -1039,13 +1093,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.587.0" = { + "@aws-sdk/middleware-user-agent-3.598.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.587.0.tgz"; - sha512 = "SyDomN+IOrygLucziG7/nOHkjUXES5oH5T7p8AboO8oakMQJdnudNXiYWTicQWO52R51U6CR27rcMPTGeMedYA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz"; + sha512 = "4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1102,22 +1156,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.587.0" = { + "@aws-sdk/region-config-resolver-3.598.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.587.0.tgz"; - sha512 = "93I7IPZtulZQoRK+O20IJ4a1syWwYPzoO2gc3v+/GNZflZPV3QJXuVbIm0pxBsu0n/mzKGUKqSOLPIaN098HcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz"; + sha512 = "oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw=="; }; }; - "@aws-sdk/s3-presigned-post-3.588.0" = { + "@aws-sdk/s3-presigned-post-3.598.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.588.0.tgz"; - sha512 = "MaQcJMkP2ZmXALGArccWVJ8LN/r3nRXcDhg7O1kK5bOhMqE7zhOTNUXtiBHVH1O3juHmdZWssORZJnsjuN1Krg=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.598.0.tgz"; + sha512 = "FH4htNIfh+wyYP0nKPCGOboFnSGe98xhipf0Uu9FZkMonxqMwUMj8tVhYE9YlrFxwhgUVY9Mca0/z4o0rgoWSw=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1129,13 +1183,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.588.0" = { + "@aws-sdk/s3-request-presigner-3.598.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.588.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.588.0.tgz"; - sha512 = "yZBNzRBayL3H2yUQzkoHdiGRDqCfxhfOYYgwW0ZP9UkI6GF/kIkeuvCH5IANGxtXKNRvz8sGW+xjsVOMN6S7Yg=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.598.0.tgz"; + sha512 = "IC06/HrZNlYxdyKH5+4A9B98NwcxJjgXOSUV581X7GpqHHspZ0T6tih8shBus3zzW8WfVqRAhJVwZtfMY55hdw=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1165,13 +1219,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.587.0" = { + "@aws-sdk/signature-v4-crt-3.598.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.587.0.tgz"; - sha512 = "U523oCCCF6xWpDkPXFPtVEg6H39K0srKA6lQB5JtXts4DAIKZOal9f0MsOIWGKVl36uf5VpPC74ZIW4YE9D3Rw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.598.0.tgz"; + sha512 = "laxTj/Ieq13nLHCcIl983ySD0lzIxWVaAik90zcXFH8nLNWwuR4V/Yfz9pcrnWZxF4taUi0CPwZbij9FKftPXg=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1183,13 +1237,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.587.0" = { + "@aws-sdk/signature-v4-multi-region-3.598.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.587.0.tgz"; - sha512 = "TR9+ZSjdXvXUz54ayHcCihhcvxI9W7102J1OK6MrLgBlPE7uRhAx42BR9L5lLJ86Xj3LuqPWf//o9d/zR9WVIg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.598.0.tgz"; + sha512 = "1r/EyTrO1gSa1FirnR8V7mabr7gk+l+HkyTI0fcTSr8ucB7gmYyW6WjkY8JCz13VYHFK62usCEDS7yoJoJOzTA=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1210,13 +1264,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.587.0" = { + "@aws-sdk/token-providers-3.598.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.587.0.tgz"; - sha512 = "ULqhbnLy1hmJNRcukANBWJmum3BbjXnurLPSFXoGdV0llXYlG55SzIla2VYqdveQEEjmsBuTZdFvXAtNpmS5Zg=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz"; + sha512 = "TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1228,13 +1282,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.577.0" = { + "@aws-sdk/types-3.598.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz"; - sha512 = "FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.598.0.tgz"; + sha512 = "742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1345,13 +1399,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.587.0" = { + "@aws-sdk/util-endpoints-3.598.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.587.0.tgz"; - sha512 = "8I1HG6Em8wQWqKcRW6m358mqebRVNpL8XrrEoT4In7xqkKkmYtHRNVYP6lcmiQh5pZ/c/FXu8dSchuFIWyEtqQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz"; + sha512 = "Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1363,13 +1417,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.577.0" = { + "@aws-sdk/util-format-url-3.598.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.577.0.tgz"; - sha512 = "SyEGC2J+y/krFRuPgiF02FmMYhqbiIkOjDE6k4nYLJQRyS6XEAGxZoG+OHeOVEM+bsDgbxokXZiM3XKGu6qFIg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.598.0.tgz"; + sha512 = "1X0PlREk5K6tQg8rFZOjoKVtDyI1WgbKJNCymHhMye6STryY6fhuuayKstiDThkqDYxqahjUJz/Tl2p5W3rbcw=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1444,13 +1498,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.577.0" = { + "@aws-sdk/util-user-agent-browser-3.598.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.577.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz"; - sha512 = "zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz"; + sha512 = "36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1462,13 +1516,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.587.0" = { + "@aws-sdk/util-user-agent-node-3.598.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.587.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.587.0.tgz"; - sha512 = "Pnl+DUe/bvnbEEDHP3iVJrOtE3HbFJBPgsD6vJ+ml/+IYk1Eq49jEG+EHZdNTPz3SDG0kbp2+7u41MKYJHR/iQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz"; + sha512 = "oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1507,13 +1561,13 @@ let sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow=="; }; }; - "@aws-sdk/xml-builder-3.575.0" = { + "@aws-sdk/xml-builder-3.598.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.575.0"; + version = "3.598.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.575.0.tgz"; - sha512 = "cWgAwmbFYNCFzPwxL705+lWps0F3ZvOckufd2KKoEZUmtpVw9/txUXNrPySUXSmRTSRhoatIMABNfStWR043bQ=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.598.0.tgz"; + sha512 = "ZIa2RK7CHFTZ4gwK77WRtsZ6vF7xwRXxJ8KQIxK2duhoTVcn0xYxpFLdW9WZZZvdP9GIF3Loqvf8DRdeU5Jc7Q=="; }; }; "@azure/abort-controller-1.1.0" = { @@ -1642,13 +1696,13 @@ let sha512 = "yRdgF03SFLqUMZZ1gKWt0cs0fvrDIkq2bJ6Oidqcoo5uM85YMBnXWMzYKK30XqIT76lkFyAaoAAy5knXhrG4Lw=="; }; }; - "@azure/identity-4.2.0" = { + "@azure/identity-4.2.1" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-4.2.0.tgz"; - sha512 = "ve3aYv79qXOJ8wRxQ5jO0eIz2DZ4o0TyME4m4vlGV5YyePddVZ+pFMzusAMODNAflYAAv1cBIhKnd4xytmXyig=="; + url = "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz"; + sha512 = "U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q=="; }; }; "@azure/logger-1.1.2" = { @@ -1660,31 +1714,31 @@ let sha512 = "l170uE7bsKpIU6B/giRc9i4NI0Mj+tANMMMxf7Zi/5cKzEqPayP7+X1WPrG7e+91JgY8N+7K7nF2WOi7iVhXvg=="; }; }; - "@azure/msal-browser-3.16.0" = { + "@azure/msal-browser-3.17.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.16.0.tgz"; - sha512 = "WKobvIisBK7sFSOwHuchH9tUMekwhJRLgLE9tKhIq0wFYGRcVGK0KivP5vZrobVZEMNCZWto0fI1VcSVoa+cig=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.17.0.tgz"; + sha512 = "csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A=="; }; }; - "@azure/msal-common-14.11.0" = { + "@azure/msal-common-14.12.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "14.11.0"; + version = "14.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.11.0.tgz"; - sha512 = "B6+IKLFs7Lsr06vjX8dPN61ENpTgiFrHf+CVo1UasHcmk5uEOq5D4thrbjsauKX+xtFryYsCDtznVDmWS4/sCg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz"; + sha512 = "IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw=="; }; }; - "@azure/msal-node-2.9.1" = { + "@azure/msal-node-2.9.2" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.1.tgz"; - sha512 = "I9Pc78mXwj/K8ydSgTfZ5A20vQ/xvfgnnhSCkienZ29b59zFy/hb2Vxmc6Gvg5pNkimSqkPnAtGoBMxYOLBm1A=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz"; + sha512 = "8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ=="; }; }; "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { @@ -1705,13 +1759,13 @@ let sha512 = "sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ=="; }; }; - "@babel/cli-7.24.6" = { + "@babel/cli-7.24.7" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.6.tgz"; - sha512 = "Sm/YhG/0REw9SKByFHDf4hkk7PYsjcsOyZgHGz1nvab4tUTQ9N4XVv+ykK0Y+VCJ3OshA/7EDyxnwCd8NEP/mQ=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz"; + sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1741,40 +1795,31 @@ let sha512 = "CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA=="; }; }; - "@babel/code-frame-7.24.6" = { + "@babel/code-frame-7.24.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz"; - sha512 = "ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA=="; + 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.24.6" = { + "@babel/compat-data-7.24.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.6.tgz"; - sha512 = "aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz"; + sha512 = "qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw=="; }; }; - "@babel/core-7.24.6" = { + "@babel/core-7.24.7" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.24.6.tgz"; - sha512 = "qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ=="; - }; - }; - "@babel/generator-7.17.7" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.17.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; - sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz"; + sha512 = "nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g=="; }; }; "@babel/generator-7.18.2" = { @@ -1795,58 +1840,58 @@ let sha512 = "Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw=="; }; }; - "@babel/generator-7.24.6" = { + "@babel/generator-7.24.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz"; - sha512 = "S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz"; + sha512 = "oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA=="; }; }; - "@babel/helper-annotate-as-pure-7.24.6" = { + "@babel/helper-annotate-as-pure-7.24.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz"; - sha512 = "DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg=="; + 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.24.6" = { + "@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.24.6"; + 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.24.6.tgz"; - sha512 = "+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw=="; + 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.24.6" = { + "@babel/helper-compilation-targets-7.24.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz"; - sha512 = "VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz"; + sha512 = "ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg=="; }; }; - "@babel/helper-create-class-features-plugin-7.24.6" = { + "@babel/helper-create-class-features-plugin-7.24.7" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz"; - sha512 = "djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz"; + sha512 = "kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.24.6" = { + "@babel/helper-create-regexp-features-plugin-7.24.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz"; - sha512 = "C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA=="; + 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=="; }; }; "@babel/helper-define-polyfill-provider-0.6.2" = { @@ -1858,184 +1903,184 @@ let sha512 = "LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ=="; }; }; - "@babel/helper-environment-visitor-7.24.6" = { + "@babel/helper-environment-visitor-7.24.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz"; - sha512 = "Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"; + sha512 = "DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="; }; }; - "@babel/helper-function-name-7.24.6" = { + "@babel/helper-function-name-7.24.7" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz"; - sha512 = "xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w=="; + 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.6" = { + "@babel/helper-hoist-variables-7.24.7" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz"; - sha512 = "SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA=="; + 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.6" = { + "@babel/helper-member-expression-to-functions-7.24.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.6.tgz"; - sha512 = "OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz"; + sha512 = "LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w=="; }; }; - "@babel/helper-module-imports-7.24.6" = { + "@babel/helper-module-imports-7.24.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz"; - sha512 = "a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g=="; + 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.24.6" = { + "@babel/helper-module-transforms-7.24.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz"; - sha512 = "Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz"; + sha512 = "1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ=="; }; }; - "@babel/helper-optimise-call-expression-7.24.6" = { + "@babel/helper-optimise-call-expression-7.24.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.6.tgz"; - sha512 = "3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA=="; + 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.24.6" = { + "@babel/helper-plugin-utils-7.24.7" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz"; - sha512 = "MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz"; + sha512 = "Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg=="; }; }; - "@babel/helper-remap-async-to-generator-7.24.6" = { + "@babel/helper-remap-async-to-generator-7.24.7" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz"; - sha512 = "1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz"; + sha512 = "9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA=="; }; }; - "@babel/helper-replace-supers-7.24.6" = { + "@babel/helper-replace-supers-7.24.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz"; - sha512 = "mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz"; + sha512 = "qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg=="; }; }; - "@babel/helper-simple-access-7.24.6" = { + "@babel/helper-simple-access-7.24.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz"; - sha512 = "nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g=="; + 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.24.6" = { + "@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.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz"; - sha512 = "jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q=="; + 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-split-export-declaration-7.24.6" = { + "@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.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz"; - sha512 = "CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw=="; + 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.6" = { + "@babel/helper-string-parser-7.24.7" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz"; - sha512 = "WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz"; + sha512 = "7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg=="; }; }; - "@babel/helper-validator-identifier-7.24.6" = { + "@babel/helper-validator-identifier-7.24.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz"; - sha512 = "4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"; + sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="; }; }; - "@babel/helper-validator-option-7.24.6" = { + "@babel/helper-validator-option-7.24.7" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz"; - sha512 = "Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz"; + sha512 = "yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw=="; }; }; - "@babel/helper-wrap-function-7.24.6" = { + "@babel/helper-wrap-function-7.24.7" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz"; - sha512 = "f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz"; + sha512 = "N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw=="; }; }; - "@babel/helpers-7.24.6" = { + "@babel/helpers-7.24.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.6.tgz"; - sha512 = "V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz"; + sha512 = "NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg=="; }; }; - "@babel/highlight-7.24.6" = { + "@babel/highlight-7.24.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz"; - sha512 = "2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"; + sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/node-7.24.6" = { + "@babel/node-7.24.7" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.24.6.tgz"; - sha512 = "63bD/Kbh1Vl6HapTZLSsyaGlQhhpF1/GpyS1oJotroJKoamOgKKEEKk3iHZAkicjcr+n4V4zdB0V+8siv6AZ5Q=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.24.7.tgz"; + sha512 = "BCYNLxUQjGTgy8bAq12jy+Lt8soGWa/5u3s7U3aTVXxviIp0YVS+/Wm0b4eaitLVvetYrEoAiRF0QOk4WKsHAQ=="; }; }; "@babel/parser-7.18.4" = { @@ -2047,49 +2092,49 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.24.6" = { + "@babel/parser-7.24.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz"; - sha512 = "eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz"; + sha512 = "9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw=="; }; }; - "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6" = { + "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" = { 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.6"; + version = "7.24.7"; 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.6.tgz"; - sha512 = "bYndrJ6Ph6Ar+GaB5VAc0JPoP80bQCm4qon6JEzXfRl5QZyQ8Ur1K6k7htxWmPA5z+k7JQvaMUrtXlqclWYzKw=="; + 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=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" = { 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.6"; + version = "7.24.7"; 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.6.tgz"; - sha512 = "iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q=="; + 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=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "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"; - sha512 = "c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ=="; + url = "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"; + sha512 = "+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ=="; }; }; - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6" = { + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7" = { 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.6"; + version = "7.24.7"; 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.6.tgz"; - sha512 = "z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ=="; + 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=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -2110,22 +2155,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-decorators-7.24.6" = { + "@babel/plugin-proposal-decorators-7.24.7" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.6.tgz"; - sha512 = "8DjR0/DzlBhz2SVi9a19/N2U5+C3y3rseXuyoKL9SP8vnbewscj1eHZtL6kpEn4UCuUmqEo0mvqyDYRFoN2gpA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz"; + sha512 = "RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.24.6" = { + "@babel/plugin-proposal-export-default-from-7.24.7" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.24.6.tgz"; - sha512 = "qPPDbYs9j5IArMFqYi85QxatHURSzRyskKpIbjrVoVglDuGdhu1s7UTCmXvP/qR2aHa3EdJ8X3iZvQAHjmdHUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.24.7.tgz"; + sha512 = "CcmFwUJ3tKhLjPdt4NP+SHMshebytF8ZTYOv5ZDpkzq2sin80Wb5vJrGt8fhPrORQCfoSa0LAxC/DW+GAC5+Hw=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -2200,13 +2245,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.24.6" = { + "@babel/plugin-syntax-decorators-7.24.7" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.6.tgz"; - sha512 = "gInH8LEqBp+wkwTVihCd/qf+4s28g81FZyvlIbAurHk9eSiItEKG7E0uNK2UdpgsD79aJVAW3R3c85h0YJ0jsw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz"; + sha512 = "Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -2218,13 +2263,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.24.6" = { + "@babel/plugin-syntax-export-default-from-7.24.7" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.6.tgz"; - sha512 = "Nzl7kZ4tjOM2LJpejBMPwZs7OJfc26++2HsMQuSrw6gxpqXGtZZ3Rj4Zt4Qm7vulMZL2gHIGGc2stnlQnHQCqA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.7.tgz"; + sha512 = "bTPz4/635WQ9WhwsyPdxUJDVpsi/X9BMmy/8Rf/UAlOO4jSql4CxUCjWI5PiM+jG+c4LVPTScoTw80geFj9+Bw=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -2236,31 +2281,31 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.24.6" = { + "@babel/plugin-syntax-flow-7.24.7" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz"; - sha512 = "gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz"; + sha512 = "9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw=="; }; }; - "@babel/plugin-syntax-import-assertions-7.24.6" = { + "@babel/plugin-syntax-import-assertions-7.24.7" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.6.tgz"; - sha512 = "BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz"; + sha512 = "Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg=="; }; }; - "@babel/plugin-syntax-import-attributes-7.24.6" = { + "@babel/plugin-syntax-import-attributes-7.24.7" = { name = "_at_babel_slash_plugin-syntax-import-attributes"; packageName = "@babel/plugin-syntax-import-attributes"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.6.tgz"; - sha512 = "D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz"; + sha512 = "hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -2281,13 +2326,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.24.6" = { + "@babel/plugin-syntax-jsx-7.24.7" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz"; - sha512 = "lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz"; + sha512 = "6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -2362,13 +2407,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.24.6" = { + "@babel/plugin-syntax-typescript-7.24.7" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz"; - sha512 = "TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz"; + sha512 = "c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA=="; }; }; "@babel/plugin-syntax-unicode-sets-regex-7.18.6" = { @@ -2380,499 +2425,499 @@ let sha512 = "727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg=="; }; }; - "@babel/plugin-transform-arrow-functions-7.24.6" = { + "@babel/plugin-transform-arrow-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz"; - sha512 = "jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ=="; + 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-generator-functions-7.24.6" = { + "@babel/plugin-transform-async-generator-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-async-generator-functions"; packageName = "@babel/plugin-transform-async-generator-functions"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.6.tgz"; - sha512 = "VEP2o4iR2DqQU6KPgizTW2mnMx6BG5b5O9iQdrW9HesLkv8GIA8x2daXBQxw1MrsIkFQGA/iJ204CKoQ8UcnAA=="; + 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=="; }; }; - "@babel/plugin-transform-async-to-generator-7.24.6" = { + "@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.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz"; - sha512 = "NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g=="; + 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.24.6" = { + "@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.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.6.tgz"; - sha512 = "XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw=="; + 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.24.6" = { + "@babel/plugin-transform-block-scoping-7.24.7" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz"; - sha512 = "S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz"; + sha512 = "Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ=="; }; }; - "@babel/plugin-transform-class-properties-7.24.6" = { + "@babel/plugin-transform-class-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-class-properties"; packageName = "@babel/plugin-transform-class-properties"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.6.tgz"; - sha512 = "j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz"; + sha512 = "vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w=="; }; }; - "@babel/plugin-transform-class-static-block-7.24.6" = { + "@babel/plugin-transform-class-static-block-7.24.7" = { name = "_at_babel_slash_plugin-transform-class-static-block"; packageName = "@babel/plugin-transform-class-static-block"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.6.tgz"; - sha512 = "1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz"; + sha512 = "HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ=="; }; }; - "@babel/plugin-transform-classes-7.24.6" = { + "@babel/plugin-transform-classes-7.24.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz"; - sha512 = "+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz"; + sha512 = "CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw=="; }; }; - "@babel/plugin-transform-computed-properties-7.24.6" = { + "@babel/plugin-transform-computed-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz"; - sha512 = "cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg=="; + 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.24.6" = { + "@babel/plugin-transform-destructuring-7.24.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz"; - sha512 = "YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz"; + sha512 = "19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.24.6" = { + "@babel/plugin-transform-dotall-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.6.tgz"; - sha512 = "rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA=="; + 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.24.6" = { + "@babel/plugin-transform-duplicate-keys-7.24.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.6.tgz"; - sha512 = "/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA=="; + 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-dynamic-import-7.24.6" = { + "@babel/plugin-transform-dynamic-import-7.24.7" = { name = "_at_babel_slash_plugin-transform-dynamic-import"; packageName = "@babel/plugin-transform-dynamic-import"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.6.tgz"; - sha512 = "vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz"; + sha512 = "sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.24.6" = { + "@babel/plugin-transform-exponentiation-operator-7.24.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.6.tgz"; - sha512 = "EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA=="; + 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-export-namespace-from-7.24.6" = { + "@babel/plugin-transform-export-namespace-from-7.24.7" = { name = "_at_babel_slash_plugin-transform-export-namespace-from"; packageName = "@babel/plugin-transform-export-namespace-from"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.6.tgz"; - sha512 = "inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz"; + sha512 = "v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.24.6" = { + "@babel/plugin-transform-flow-strip-types-7.24.7" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz"; - sha512 = "1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ=="; + 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=="; }; }; - "@babel/plugin-transform-for-of-7.24.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.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.6.tgz"; - sha512 = "n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg=="; + 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.24.6" = { + "@babel/plugin-transform-function-name-7.24.7" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz"; - sha512 = "sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz"; + sha512 = "U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w=="; }; }; - "@babel/plugin-transform-json-strings-7.24.6" = { + "@babel/plugin-transform-json-strings-7.24.7" = { name = "_at_babel_slash_plugin-transform-json-strings"; packageName = "@babel/plugin-transform-json-strings"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.6.tgz"; - sha512 = "Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz"; + sha512 = "2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw=="; }; }; - "@babel/plugin-transform-literals-7.24.6" = { + "@babel/plugin-transform-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz"; - sha512 = "f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz"; + sha512 = "vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ=="; }; }; - "@babel/plugin-transform-logical-assignment-operators-7.24.6" = { + "@babel/plugin-transform-logical-assignment-operators-7.24.7" = { name = "_at_babel_slash_plugin-transform-logical-assignment-operators"; packageName = "@babel/plugin-transform-logical-assignment-operators"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.6.tgz"; - sha512 = "EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz"; + sha512 = "4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.24.6" = { + "@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.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.6.tgz"; - sha512 = "9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ=="; + 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.24.6" = { + "@babel/plugin-transform-modules-amd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.6.tgz"; - sha512 = "eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ=="; + 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.24.6" = { + "@babel/plugin-transform-modules-commonjs-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz"; - sha512 = "JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz"; + sha512 = "iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.24.6" = { + "@babel/plugin-transform-modules-systemjs-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.6.tgz"; - sha512 = "xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz"; + sha512 = "GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw=="; }; }; - "@babel/plugin-transform-modules-umd-7.24.6" = { + "@babel/plugin-transform-modules-umd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.6.tgz"; - sha512 = "esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg=="; + 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.24.6" = { + "@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.24.6"; + 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.24.6.tgz"; - sha512 = "6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q=="; + 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.24.6" = { + "@babel/plugin-transform-new-target-7.24.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.6.tgz"; - sha512 = "f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA=="; + 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-nullish-coalescing-operator-7.24.6" = { + "@babel/plugin-transform-nullish-coalescing-operator-7.24.7" = { name = "_at_babel_slash_plugin-transform-nullish-coalescing-operator"; packageName = "@babel/plugin-transform-nullish-coalescing-operator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.6.tgz"; - sha512 = "+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz"; + sha512 = "Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ=="; }; }; - "@babel/plugin-transform-numeric-separator-7.24.6" = { + "@babel/plugin-transform-numeric-separator-7.24.7" = { name = "_at_babel_slash_plugin-transform-numeric-separator"; packageName = "@babel/plugin-transform-numeric-separator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.6.tgz"; - sha512 = "6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz"; + sha512 = "e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA=="; }; }; - "@babel/plugin-transform-object-rest-spread-7.24.6" = { + "@babel/plugin-transform-object-rest-spread-7.24.7" = { name = "_at_babel_slash_plugin-transform-object-rest-spread"; packageName = "@babel/plugin-transform-object-rest-spread"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.6.tgz"; - sha512 = "OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz"; + sha512 = "4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q=="; }; }; - "@babel/plugin-transform-object-super-7.24.6" = { + "@babel/plugin-transform-object-super-7.24.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.6.tgz"; - sha512 = "N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg=="; + 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-optional-catch-binding-7.24.6" = { + "@babel/plugin-transform-optional-catch-binding-7.24.7" = { name = "_at_babel_slash_plugin-transform-optional-catch-binding"; packageName = "@babel/plugin-transform-optional-catch-binding"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.6.tgz"; - sha512 = "L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz"; + sha512 = "uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA=="; }; }; - "@babel/plugin-transform-optional-chaining-7.24.6" = { + "@babel/plugin-transform-optional-chaining-7.24.7" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.6.tgz"; - sha512 = "cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz"; + sha512 = "tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ=="; }; }; - "@babel/plugin-transform-parameters-7.24.6" = { + "@babel/plugin-transform-parameters-7.24.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz"; - sha512 = "ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz"; + sha512 = "yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA=="; }; }; - "@babel/plugin-transform-private-methods-7.24.6" = { + "@babel/plugin-transform-private-methods-7.24.7" = { name = "_at_babel_slash_plugin-transform-private-methods"; packageName = "@babel/plugin-transform-private-methods"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz"; - sha512 = "T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz"; + sha512 = "COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ=="; }; }; - "@babel/plugin-transform-private-property-in-object-7.24.6" = { + "@babel/plugin-transform-private-property-in-object-7.24.7" = { name = "_at_babel_slash_plugin-transform-private-property-in-object"; packageName = "@babel/plugin-transform-private-property-in-object"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz"; - sha512 = "Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz"; + sha512 = "9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA=="; }; }; - "@babel/plugin-transform-property-literals-7.24.6" = { + "@babel/plugin-transform-property-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.6.tgz"; - sha512 = "oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz"; + sha512 = "EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA=="; }; }; - "@babel/plugin-transform-react-display-name-7.24.6" = { + "@babel/plugin-transform-react-display-name-7.24.7" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.6.tgz"; - sha512 = "/3iiEEHDsJuj9QU09gbyWGSUxDboFcD7Nj6dnHIlboWSodxXAoaY/zlNMHeYAC0WsERMqgO9a7UaM77CsYgWcg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz"; + sha512 = "H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg=="; }; }; - "@babel/plugin-transform-react-jsx-7.24.6" = { + "@babel/plugin-transform-react-jsx-7.24.7" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.6.tgz"; - sha512 = "pCtPHhpRZHfwdA5G1Gpk5mIzMA99hv0R8S/Ket50Rw+S+8hkt3wBWqdqHaPw0CuUYxdshUgsPiLQ5fAs4ASMhw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz"; + sha512 = "+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.24.6" = { + "@babel/plugin-transform-react-jsx-self-7.24.7" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.6.tgz"; - sha512 = "FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz"; + sha512 = "fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.24.6" = { + "@babel/plugin-transform-react-jsx-source-7.24.7" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.6.tgz"; - sha512 = "BQTBCXmFRreU3oTUXcGKuPOfXAGb1liNY4AvvFKsOBAJ89RKcTsIrSsnMYkj59fNa66OFKnSa4AJZfy5Y4B9WA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz"; + sha512 = "J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ=="; }; }; - "@babel/plugin-transform-regenerator-7.24.6" = { + "@babel/plugin-transform-regenerator-7.24.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.6.tgz"; - sha512 = "SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg=="; + 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.24.6" = { + "@babel/plugin-transform-reserved-words-7.24.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.6.tgz"; - sha512 = "DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A=="; + 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.24.6" = { + "@babel/plugin-transform-runtime-7.24.7" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.6.tgz"; - sha512 = "W3gQydMb0SY99y/2lV0Okx2xg/8KzmZLQsLaiCmwNRl1kKomz14VurEm+2TossUb+sRvBCnGe+wx8KtIgDtBbQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz"; + sha512 = "YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.24.6" = { + "@babel/plugin-transform-shorthand-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz"; - sha512 = "xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw=="; + 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.24.6" = { + "@babel/plugin-transform-spread-7.24.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz"; - sha512 = "h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz"; + sha512 = "x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.24.6" = { + "@babel/plugin-transform-sticky-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz"; - sha512 = "fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw=="; + 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.24.6" = { + "@babel/plugin-transform-template-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.6.tgz"; - sha512 = "BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg=="; + 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.24.6" = { + "@babel/plugin-transform-typeof-symbol-7.24.7" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.6.tgz"; - sha512 = "IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz"; + sha512 = "VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg=="; }; }; - "@babel/plugin-transform-typescript-7.24.6" = { + "@babel/plugin-transform-typescript-7.24.7" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz"; - sha512 = "H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz"; + sha512 = "iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.24.6" = { + "@babel/plugin-transform-unicode-escapes-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.6.tgz"; - sha512 = "bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw=="; + 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-property-regex-7.24.6" = { + "@babel/plugin-transform-unicode-property-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-property-regex"; packageName = "@babel/plugin-transform-unicode-property-regex"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.6.tgz"; - sha512 = "8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz"; + sha512 = "uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w=="; }; }; - "@babel/plugin-transform-unicode-regex-7.24.6" = { + "@babel/plugin-transform-unicode-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz"; - sha512 = "pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz"; + sha512 = "hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg=="; }; }; - "@babel/plugin-transform-unicode-sets-regex-7.24.6" = { + "@babel/plugin-transform-unicode-sets-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-sets-regex"; packageName = "@babel/plugin-transform-unicode-sets-regex"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.6.tgz"; - sha512 = "quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz"; + sha512 = "2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2884,22 +2929,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.24.6" = { + "@babel/preset-env-7.24.7" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.6.tgz"; - sha512 = "CrxEAvN7VxfjOG8JNF2Y/eMqMJbZPZ185amwGUBp8D9USK90xQmv7dLdFSa+VbD7fdIqcy/Mfv7WtzG8+/qxKg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz"; + sha512 = "1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ=="; }; }; - "@babel/preset-flow-7.24.6" = { + "@babel/preset-flow-7.24.7" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.6.tgz"; - sha512 = "huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.7.tgz"; + sha512 = "NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2911,13 +2956,13 @@ let sha512 = "HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="; }; }; - "@babel/preset-typescript-7.24.6" = { + "@babel/preset-typescript-7.24.7" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz"; - sha512 = "U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz"; + sha512 = "SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ=="; }; }; "@babel/register-7.24.6" = { @@ -2938,13 +2983,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.24.6" = { + "@babel/runtime-7.24.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.6.tgz"; - sha512 = "Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz"; + sha512 = "UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw=="; }; }; "@babel/runtime-7.9.0" = { @@ -2965,40 +3010,22 @@ let sha512 = "Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA=="; }; }; - "@babel/template-7.24.6" = { + "@babel/template-7.24.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.24.6.tgz"; - sha512 = "3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz"; + sha512 = "jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig=="; }; }; - "@babel/traverse-7.23.2" = { + "@babel/traverse-7.24.7" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.2"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"; - sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; - }; - }; - "@babel/traverse-7.24.6" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.24.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.6.tgz"; - sha512 = "OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw=="; - }; - }; - "@babel/types-7.17.0" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz"; + sha512 = "yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA=="; }; }; "@babel/types-7.19.0" = { @@ -3019,13 +3046,13 @@ let sha512 = "+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w=="; }; }; - "@babel/types-7.24.6" = { + "@babel/types-7.24.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz"; - sha512 = "WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz"; + sha512 = "XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q=="; }; }; "@bmewburn/js-beautify-1.14.9" = { @@ -3154,13 +3181,13 @@ let sha512 = "EeEjMobfuJrwoctj7FA1y1KEbM0+Q1xSjobIEyie9k4haVEBB7vkDvsasw1pM3rO39mL2akxIAzLMUAtrMHZhA=="; }; }; - "@cloudflare/workers-types-4.20240603.0" = { + "@cloudflare/workers-types-4.20240605.0" = { name = "_at_cloudflare_slash_workers-types"; packageName = "@cloudflare/workers-types"; - version = "4.20240603.0"; + version = "4.20240605.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240603.0.tgz"; - sha512 = "KmsjZcd/dPWM51FoT08cvUGCq9l3nFEriloQ12mcdJPoW911Gi5S/9Cq4xeFvTrtk9TJ2krvxP23IeobecRmOQ=="; + url = "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240605.0.tgz"; + sha512 = "zJw4Q6CnkaQ5JZmHRkNiSs5GfiRgUIUL8BIHPQkd2XUHZkIBv9M9yc0LKEwMYGpCFC+oSOltet6c9RjP9uQ99g=="; }; }; "@colors/colors-1.6.0" = { @@ -3451,13 +3478,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-5.1.8" = { + "@cspell/dict-cpp-5.1.9" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "5.1.8"; + version = "5.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.8.tgz"; - sha512 = "X5uq0uRqN6cyOZOZV1YKi6g8sBtd0+VoF5NbDWURahGR8TRsiztH0sNqs0IB3X0dW4GakU+n9SXcuEmxynkSsw=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.9.tgz"; + sha512 = "lZmPKn3qfkWQ7tr+yw6JhuhscsyRgRHEOpOd0fhtPt0N154FNsGebGGLW0SOZUuGgW7Nk3lCCwHP85GIemnlqQ=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3523,13 +3550,13 @@ let sha512 = "cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw=="; }; }; - "@cspell/dict-data-science-1.0.11" = { + "@cspell/dict-data-science-2.0.1" = { name = "_at_cspell_slash_dict-data-science"; packageName = "@cspell/dict-data-science"; - version = "1.0.11"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-1.0.11.tgz"; - sha512 = "TaHAZRVe0Zlcc3C23StZqqbzC0NrodRwoSAc8dis+5qLeLLnOCtagYQeROQvDlcDg3X/VVEO9Whh4W/z4PAmYQ=="; + url = "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.1.tgz"; + sha512 = "xeutkzK0eBe+LFXOFU2kJeAYO6IuFUc1g7iRLr7HeCmlC4rsdGclwGHh61KmttL3+YHQytYStxaRBdGAXWC8Lw=="; }; }; "@cspell/dict-django-1.0.26" = { @@ -3802,13 +3829,13 @@ let sha512 = "LcOg9srYLDoNGd8n3kbfDBlZD+LOC9IVcnFCdua1b/luCHNVmlgBx7e677qPu7olpMYOD5TQIVW2OmM1+/6MFA=="; }; }; - "@cspell/dict-java-5.0.6" = { + "@cspell/dict-java-5.0.7" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.6.tgz"; - sha512 = "kdE4AHHHrixyZ5p6zyms1SLoYpaJarPxrz8Tveo6gddszBVVwIUZ+JkQE1bWNLK740GWzIXdkznpUfw1hP9nXw=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.7.tgz"; + sha512 = "ejQ9iJXYIq7R09BScU2y5OUGrSqwcD+J5mHFOKbduuQ5s/Eh/duz45KOzykeMLI6KHPVxhBKpUPBWIsfewECpQ=="; }; }; "@cspell/dict-julia-1.0.1" = { @@ -3946,13 +3973,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-4.0.7" = { + "@cspell/dict-php-4.0.8" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.7.tgz"; - sha512 = "SUCOBfRDDFz1E2jnAZIIuy8BNbCc8i+VkiL9g4HH9tTN6Nlww5Uz2pMqYS6rZQkXuubqsbkbPlsRiuseEnTmYA=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.8.tgz"; + sha512 = "TBw3won4MCBQ2wdu7kvgOCR3dY2Tb+LJHgDUpuquy3WnzGiSDJ4AVelrZdE1xu7mjFJUr4q48aB21YT5uQqPZA=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -3991,13 +4018,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.1.11" = { + "@cspell/dict-python-4.2.1" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.1.11"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.11.tgz"; - sha512 = "XG+v3PumfzUW38huSbfT15Vqt3ihNb462ulfXifpQllPok5OWynhszCLCRQjQReV+dgz784ST4ggRxW452/kVg=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.1.tgz"; + sha512 = "9X2jRgyM0cxBoFQRo4Zc8oacyWnXi+0/bMI5FGibZNZV4y/o9UoFEr6agjU260/cXHTjIdkX233nN7eb7dtyRg=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -4036,13 +4063,13 @@ let sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw=="; }; }; - "@cspell/dict-rust-4.0.3" = { + "@cspell/dict-rust-4.0.4" = { name = "_at_cspell_slash_dict-rust"; packageName = "@cspell/dict-rust"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.3.tgz"; - sha512 = "8DFCzkFQ+2k3fDaezWc/D+0AyiBBiOGYfSDUfrTNU7wpvUvJ6cRcAUshMI/cn2QW/mmxTspRgVlXsE6GUMz00Q=="; + url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.4.tgz"; + sha512 = "v9/LcZknt/Xq7m1jdTWiQEtmkVVKdE1etAfGL2sgcWpZYewEa459HeWndNA0gfzQrpWX9sYay18mt7pqClJEdA=="; }; }; "@cspell/dict-scala-1.0.21" = { @@ -4072,13 +4099,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.4.1" = { + "@cspell/dict-software-terms-3.4.6" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.4.1"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.4.1.tgz"; - sha512 = "JgNHVdWEUhZKCYBiAjsLojkw8WhvsTXyk/IfFby0Lzbl+/AoJvL/XZqr0pvqfpBjbv7pwtnjahrbGxPRCOV+gA=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.4.6.tgz"; + sha512 = "Cap+WL4iM9NgwxdVIa93aDEGKGNm1t+DLJTnjoWkGHXxSBPG8Kcbnlss6mTtwLv9/NYPmQsmJi5qHXruuHx2ow=="; }; }; "@cspell/dict-sql-2.1.3" = { @@ -4576,15 +4603,6 @@ let 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-arm-0.19.8" = { name = "_at_esbuild_slash_android-arm"; packageName = "@esbuild/android-arm"; @@ -4603,15 +4621,6 @@ let 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-arm64-0.19.8" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4630,15 +4639,6 @@ let 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/android-x64-0.19.8" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4657,15 +4657,6 @@ let 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-arm64-0.19.8" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4684,15 +4675,6 @@ let 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/darwin-x64-0.19.8" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4711,15 +4693,6 @@ let 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-arm64-0.19.8" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4738,15 +4711,6 @@ let 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/freebsd-x64-0.19.8" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4765,15 +4729,6 @@ let 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-arm-0.19.8" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4792,15 +4747,6 @@ let 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-arm64-0.19.8" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4819,15 +4765,6 @@ let 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-ia32-0.19.8" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4846,15 +4783,6 @@ let 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-loong64-0.19.8" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4873,15 +4801,6 @@ let 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-mips64el-0.19.8" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4900,15 +4819,6 @@ let 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-ppc64-0.19.8" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4927,15 +4837,6 @@ let 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-riscv64-0.19.8" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4954,15 +4855,6 @@ let 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-s390x-0.19.8" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4981,15 +4873,6 @@ let 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/linux-x64-0.19.8" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -5008,15 +4891,6 @@ let 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/netbsd-x64-0.19.8" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -5035,15 +4909,6 @@ let 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/openbsd-x64-0.19.8" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -5062,15 +4927,6 @@ let 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/sunos-x64-0.19.8" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -5089,15 +4945,6 @@ let 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-arm64-0.19.8" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -5116,15 +4963,6 @@ let 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"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; - sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; - }; - }; "@esbuild/win32-ia32-0.19.8" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -5143,15 +4981,6 @@ let sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; }; }; - "@esbuild/win32-x64-0.18.20" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; - sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; - }; - }; "@esbuild/win32-x64-0.19.8" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -5179,13 +5008,13 @@ let sha512 = "Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA=="; }; }; - "@eslint/config-array-0.15.1" = { + "@eslint/config-array-0.16.0" = { name = "_at_eslint_slash_config-array"; packageName = "@eslint/config-array"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.15.1.tgz"; - sha512 = "K4gzNq+yymn/EVsXYmf+SBcBro8MTf+aXJZUphM96CdzUEr+ClGDvAbpmaEK+cGVigVXIgs9gNmvHAlrzzY5JQ=="; + url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.16.0.tgz"; + sha512 = "/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -5215,15 +5044,6 @@ let sha512 = "4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ=="; }; }; - "@eslint/js-8.44.0" = { - name = "_at_eslint_slash_js"; - packageName = "@eslint/js"; - version = "8.44.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz"; - sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; - }; - }; "@eslint/js-8.57.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; @@ -5233,22 +5053,22 @@ let sha512 = "Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g=="; }; }; - "@eslint/js-9.4.0" = { + "@eslint/js-9.5.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-9.4.0.tgz"; - sha512 = "fdI7VJjP3Rvc70lC4xkFXHB0fiPeojiL1PxVG6t1ZvXQrarj893PweuBTujxDUFk0Fxj4R7PIIAZ/aiiyZPZcg=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz"; + sha512 = "A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w=="; }; }; - "@eslint/object-schema-2.1.3" = { + "@eslint/object-schema-2.1.4" = { name = "_at_eslint_slash_object-schema"; packageName = "@eslint/object-schema"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.3.tgz"; - sha512 = "HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw=="; + url = "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz"; + sha512 = "BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -5440,22 +5260,22 @@ let sha512 = "FyWghLu7rUaZEZSTLt/XNRukm0c9GFfwP0iFaswoDWpV6alvVg+zRAfCLdIVQEz1SVcQ3zo1hMZFDrnKGvkCuQ=="; }; }; - "@expo/eas-build-job-1.0.114" = { + "@expo/eas-build-job-1.0.117" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.114"; + version = "1.0.117"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.114.tgz"; - sha512 = "71zFqQmHVUGfSWcd3NZ+y1LEWLUJ+qNN2ZMwRzfOty75CFFwKJ2gPUm5b19Q3SlEmUUwI67RO/D/B2M7OlDjHw=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.117.tgz"; + sha512 = "l1EBpRH4lqRg0uPKl4/xn3V77dzWDrSAIU0r88aNq+Slznpu8U8HCkEZSh2YyF/BFhhs5lG7v8yQclVaflVBrQ=="; }; }; - "@expo/eas-json-9.0.8" = { + "@expo/eas-json-10.0.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "9.0.8"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-9.0.8.tgz"; - sha512 = "BI1dpjPy5ayhMzvvuqKgYMU5i0BGIcqmQCjWcyD4+xZpeU1mKEaSxMM1jbgn5ODOodZEgr4WlQKzDcFDSvr12A=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.0.tgz"; + sha512 = "3RIzqeNGhiWLfU8IGH9sxgI8OaWAAjEMprDuec1//C2QARylA6agx2knqLEi5BmSCZDPiw7QwUN3+XskHKq85w=="; }; }; "@expo/fingerprint-0.6.1" = { @@ -5530,13 +5350,13 @@ let sha512 = "eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A=="; }; }; - "@expo/logger-1.0.57" = { + "@expo/logger-1.0.117" = { name = "_at_expo_slash_logger"; packageName = "@expo/logger"; - version = "1.0.57"; + version = "1.0.117"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/logger/-/logger-1.0.57.tgz"; - sha512 = "kd/1MOrVST9gQtnTD+qAV3KdrYCV9oShzIqYek+5XI3M/6QNvfv8IPr2pv+xaYZoCZgnNdI4ViWo0eYBDJMngA=="; + url = "https://registry.npmjs.org/@expo/logger/-/logger-1.0.117.tgz"; + sha512 = "tuCT5fmjRjED6HYAf4HgE+UbiHT3JYrkUzUv9FC769goxo4LuuewBNQiDUkeecQTha7aTS5aO2YHlfdipI8gzg=="; }; }; "@expo/metro-config-0.6.0" = { @@ -5746,13 +5566,13 @@ let sha512 = "QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="; }; }; - "@expo/steps-1.0.114" = { + "@expo/steps-1.0.117" = { name = "_at_expo_slash_steps"; packageName = "@expo/steps"; - version = "1.0.114"; + version = "1.0.117"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.114.tgz"; - sha512 = "TbSCv2cXQQKRXPjZ5BQwo5H4gNNXF05+oWQBaR0k98A4MFXfiaoyAPK/7No2xNj7xBC3rXU+dKzTjMMnTlyt/w=="; + url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.117.tgz"; + sha512 = "MjBYD5/F4tLB1TERyBCk8jF9bmhh99b2lgC6NHGD3J4QrFYSyct9CxIHJixdgaEo0QLMe0ltf3zQsJQSM+kWDw=="; }; }; "@expo/timeago.js-1.0.0" = { @@ -6043,6 +5863,15 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; + "@graphql-tools/load-6.2.8" = { + name = "_at_graphql-tools_slash_load"; + packageName = "@graphql-tools/load"; + version = "6.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.8.tgz"; + sha512 = "JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA=="; + }; + }; "@graphql-tools/load-8.0.2" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; @@ -6151,13 +5980,13 @@ let sha512 = "1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ=="; }; }; - "@graphql-tools/utils-10.2.1" = { + "@graphql-tools/utils-10.2.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.2.1.tgz"; - sha512 = "U8OMdkkEt3Vp3uYHU2pMc6mwId7axVAcSSmcqJcUmWNPqY2pfee5O655ybTI2kNPWAe58Zu6gLu4Oi4QT4BgWA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.2.2.tgz"; + sha512 = "ueoplzHIgFfxhFrF4Mf/niU/tYHuO6Uekm2nCYU72qpI+7Hn9dA2/o5XOBvFXDk27Lp5VSvQY5WfmRbqwVxaYQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -6268,24 +6097,6 @@ let sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; - "@headlessui/react-1.7.19" = { - name = "_at_headlessui_slash_react"; - packageName = "@headlessui/react"; - version = "1.7.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@headlessui/react/-/react-1.7.19.tgz"; - sha512 = "Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw=="; - }; - }; - "@heroicons/react-2.0.18" = { - name = "_at_heroicons_slash_react"; - packageName = "@heroicons/react"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@heroicons/react/-/react-2.0.18.tgz"; - sha512 = "7TyMjRrZZMBPa+/5Y8lN0iyvUU/01PeMGX2+RE7cQWpEUIcb4QotzUObFkJDejj/HUH4qjP/eQ0gzzKs2f+6Yw=="; - }; - }; "@hpcc-js/wasm-2.16.2" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; @@ -6385,13 +6196,13 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-1.17.0" = { + "@ibm-cloud/openapi-ruleset-1.17.1" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.17.0.tgz"; - sha512 = "Fv5iJX2iK0dFL82FE8SvA/ifEV7EYAmRf1czxheVkSm8FEGhMMrXJAQXNWZGIEJex/edgybs0C1AUHK0H97hCg=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.17.1.tgz"; + sha512 = "LtmPscvla4FuCwkX7SSFpKUriIrbmh/MgHJDp1B5yNe656/uDvNgCppi87eXdTg1fjwalj400Ldk2Di1sVks6w=="; }; }; "@ibm-cloud/openapi-ruleset-utilities-1.3.2" = { @@ -6538,24 +6349,6 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@istanbuljs/load-nyc-config-1.1.0" = { - name = "_at_istanbuljs_slash_load-nyc-config"; - packageName = "@istanbuljs/load-nyc-config"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; - }; - }; - "@istanbuljs/schema-0.1.3" = { - name = "_at_istanbuljs_slash_schema"; - packageName = "@istanbuljs/schema"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"; - sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; - }; - }; "@jcubic/lily-0.3.0" = { name = "_at_jcubic_slash_lily"; packageName = "@jcubic/lily"; @@ -6862,15 +6655,6 @@ let sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA=="; }; }; - "@johnsoncodehk/pug-beautify-0.2.2" = { - name = "_at_johnsoncodehk_slash_pug-beautify"; - packageName = "@johnsoncodehk/pug-beautify"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@johnsoncodehk/pug-beautify/-/pug-beautify-0.2.2.tgz"; - sha512 = "qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA=="; - }; - }; "@joplin/fork-htmlparser2-4.1.51" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -7060,6 +6844,15 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; + "@jsii/check-node-1.100.0" = { + name = "_at_jsii_slash_check-node"; + packageName = "@jsii/check-node"; + version = "1.100.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.100.0.tgz"; + sha512 = "4bsO7Y6YyekBk4v4iatAl5E7QQs2UUPtHoP9gfT3UnpbKzyMjH8XholSVCjfcNSKBwFobPMb8iA7NCMIMqFKsQ=="; + }; + }; "@jsii/check-node-1.95.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; @@ -7087,13 +6880,13 @@ let sha512 = "RJeVopU3U+/ZxGj//KKJgXmDM8N7uP5QIqypb0QFVJPtIcQMM9nuEQWp4hOB3ajhk4VNaXGrG6PwlqFtFsqbbQ=="; }; }; - "@jsii/spec-1.99.0" = { + "@jsii/spec-1.100.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.99.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.99.0.tgz"; - sha512 = "R4E0lFj+C2PpLt2tnexIlQA7Ovy52tL9PRcDy6sUcnJto4iZufexudIm4pjIJPN+bfwimQX5aMjALloRwDixtQ=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.100.0.tgz"; + sha512 = "4LJCpSkmi3Hfcbmbchv+2JPIquV+cgrkhQcwglBAWqS4liLGbWPwgfHRL22sMXEKXiyXeHfitVwkP+IoGIyJ8g=="; }; }; "@jsonjoy.com/base64-1.1.2" = { @@ -7339,13 +7132,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.127.0" = { + "@microsoft/rush-lib-5.128.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.127.0.tgz"; - sha512 = "zlW9lrlUL9eLLcvCNyVMYrjUe715jbFoAhHxbFS29W2Mnd9pdoETLMz1oagcQDUl7t5ZbJJi/0NpCfcHxOAXtA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.128.1.tgz"; + sha512 = "8U1c3puDh10ZVNHR+Fk/juAQCwNdxRUNEVjRNkyoxDeAznca8Uo7ix7RoWOOQChh43JkeewRXmaHwmY4yiiL+g=="; }; }; "@mischnic/json-sourcemap-0.1.1" = { @@ -7402,22 +7195,13 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@noble/curves-1.3.0" = { + "@noble/curves-1.4.0" = { name = "_at_noble_slash_curves"; packageName = "@noble/curves"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz"; - sha512 = "t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA=="; - }; - }; - "@noble/hashes-1.3.3" = { - name = "_at_noble_slash_hashes"; - packageName = "@noble/hashes"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz"; - sha512 = "V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="; + url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz"; + sha512 = "p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg=="; }; }; "@noble/hashes-1.4.0" = { @@ -7438,58 +7222,58 @@ let sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; }; }; - "@node-red/editor-api-3.1.9" = { + "@node-red/editor-api-3.1.10" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.9.tgz"; - sha512 = "HHhFiwxmD8V5+U/xe+Gl9T0oAnwFeA7zisG8VW+Ruh3apGQvV9l5UoL9Yg00jEPDOhL99k/wqcXI42lakEkiKw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.10.tgz"; + sha512 = "6W9W3CHOVIG4UC1YescfNqGhW04XDWg9UJQSMGSbRMoiMRhk+X3K1If1xtU7oE18pHKTH1+69oJELH7yh4msGw=="; }; }; - "@node-red/editor-client-3.1.9" = { + "@node-red/editor-client-3.1.10" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.9.tgz"; - sha512 = "k8ik9fqcUxwsjEL0bBywNRYoFk7VZxdcoXRKCtcB3H8T/KRgQBDZu4j27dtff/5WPqnvtmXOQBbdDrhluMO0ng=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.10.tgz"; + sha512 = "l5ircZrEL8PzP7RHA49H7AVdSQY+vGJIoy57YaL6G0vHuCYO6u9Bh6chJ9s+6RWIRCqcU6HorTdSS3gzVspGdA=="; }; }; - "@node-red/nodes-3.1.9" = { + "@node-red/nodes-3.1.10" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.9.tgz"; - sha512 = "H0ZJjgmc7tbDBExF8WWIab7VJ1PBJxqExc6HWfb5FJQcOyA9mzCXwBduirWGxWAbQzZvq5GLgzy5ECzDJIjbSQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.10.tgz"; + sha512 = "e7NvnF/gdM6HnqR6NwMz5M9I3vW6RWqfEvu8aIkNVNj3ojJnTzxKXLVs5pSaC56M/Q309McrGSuyG0ysI9fXDA=="; }; }; - "@node-red/registry-3.1.9" = { + "@node-red/registry-3.1.10" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.9.tgz"; - sha512 = "lm1jNGO5ebax5kw5A2stOymMVQpuAGJ24M+3bfPYj3djzgBq4qKbNX6EAJLtyLHlCKecAybJoXDNpNcCnl7BXQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.10.tgz"; + sha512 = "iy2GP5AyArOTHnAKXJ0FBIrllfexQOA1LE43hbAZtZWtsgckuTxMWTW1m1U7hYzFvYJNKfAEPz3DNP5pVadd7g=="; }; }; - "@node-red/runtime-3.1.9" = { + "@node-red/runtime-3.1.10" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.9.tgz"; - sha512 = "tpuHE5gEqLx9OoRjSxsyh683yGCnBlAAwbjkVv5lonqYqLJwE3DCJnMuHYj1lPUDzSc0QzhE9efm+LIhAhBU4g=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.10.tgz"; + sha512 = "pFTY/khvBX3wZQ9ibDFVKL1raCvgJ018idBQ7WxcjemYIUTk096iWNofsje08tsR904KNwC1ZZ437cf+s6Xt7Q=="; }; }; - "@node-red/util-3.1.9" = { + "@node-red/util-3.1.10" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.9.tgz"; - sha512 = "BT7mMds8MFrXwgGuNjmk/vY0X621hirLcqAOp5/ZrrFuzPVoK4PDgoNx5igYD/HVQbVcJTHfN1cRopSFPfdF2Q=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.10.tgz"; + sha512 = "1wL5HS+F0w48QkmHeIy5/II+CJdoW30P2zdm53JlvrE8OG0887mTapjGqmEG+djkJAfDIO/0El+8Q8U2qt9W5A=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -7663,13 +7447,13 @@ let sha512 = "PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ=="; }; }; - "@npmcli/redact-2.0.0" = { + "@npmcli/redact-2.0.1" = { name = "_at_npmcli_slash_redact"; packageName = "@npmcli/redact"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.0.tgz"; - sha512 = "SEjCPAVHWYUIQR+Yn03kJmrJjZDtJLYpj300m3HV9OTRZNpC5YpbMsM3eTkECyT4aWj8lDr9WeY6TWefpubtYQ=="; + url = "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz"; + sha512 = "YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw=="; }; }; "@npmcli/run-script-7.0.2" = { @@ -7690,31 +7474,31 @@ let sha512 = "y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg=="; }; }; - "@nrwl/devkit-19.1.2" = { + "@nrwl/devkit-19.3.0" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "19.1.2"; + version = "19.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.1.2.tgz"; - sha512 = "vWI+OrTICE9Yw6C/jIwxybnvavI9dnQJ7tpzFbLcSVfFAGdFtYJGCLVe40IkWcvUfELoVmzpXtKP/sPy0D7J9w=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.3.0.tgz"; + sha512 = "WRcph/7U37HkTLIRzQ2oburZVfEFkPHJUn7vmo46gCq+N2cAKy3qwONO0RbthhjFIsG94YPXqFWFlV6k4nXpxA=="; }; }; - "@nrwl/tao-19.1.2" = { + "@nrwl/tao-19.3.0" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "19.1.2"; + version = "19.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.1.2.tgz"; - sha512 = "OseWzHXNwOmZinUjHCD+edinvNJq5ngGrn/yKO81Zm/FDxkcYjud20dMsXi8zYfgDjvQv22eDtk5v1BTlSx57A=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.3.0.tgz"; + sha512 = "MyGYeHbh9O4Tv9xmz3Du+/leY5sKUHaPy4ancfNyShHgYi21hemX0/YYjzzoYHi44D8GzSc1XG2rAuwba7Kilw=="; }; }; - "@nx/devkit-19.1.2" = { + "@nx/devkit-19.3.0" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "19.1.2"; + version = "19.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.1.2.tgz"; - sha512 = "oHYZzfmvogPh7z8pf1RjW7eJaS05VZ1Ts/axlWerzQauWT7aoeyCaxa0D9q3ThnUuDt1PqKjwJi5jmCihBT2Sw=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.3.0.tgz"; + sha512 = "Natya5nzvHH0qTOIL1w/EZtwMgDx87Dgz0LgeY7te2fULaNFcj5fVrP+mUKEJZR+NccO7GPumT2RPhuEl9rPnQ=="; }; }; "@oclif/color-1.0.13" = { @@ -8167,22 +7951,22 @@ let sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg=="; }; }; - "@opentelemetry/api-1.8.0" = { + "@opentelemetry/api-1.9.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz"; - sha512 = "I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz"; + sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="; }; }; - "@opentelemetry/core-1.24.1" = { + "@opentelemetry/core-1.25.0" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.24.1.tgz"; - sha512 = "wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.0.tgz"; + sha512 = "n0B3s8rrqGrasTgNkXLKXzN0fXo+6IYP7M5b7AMsrZM33f/y6DS6kJ0Btd7SespASWq8bgL3taLo0oe0vB52IQ=="; }; }; "@opentelemetry/instrumentation-0.41.2" = { @@ -8194,103 +7978,112 @@ let sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; }; }; - "@opentelemetry/resources-1.24.1" = { + "@opentelemetry/resources-1.25.0" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.24.1.tgz"; - sha512 = "cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.0.tgz"; + sha512 = "iHjydPMYJ+Li1auveJCq2rp5U2h6Mhq8BidiyE0jfVlDTFyR1ny8AfJHfmFzJ/RAM8vT8L7T21kcmGybxZC7lQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.24.1" = { + "@opentelemetry/sdk-trace-base-1.25.0" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.1.tgz"; - sha512 = "zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.0.tgz"; + sha512 = "6+g2fiRQUG39guCsKVeY8ToeuUf3YUnPkN6DXRA1qDmFLprlLvZm9cS6+chgbW70cZJ406FTtSCDnJwxDC5sGQ=="; }; }; - "@opentelemetry/semantic-conventions-1.24.1" = { + "@opentelemetry/semantic-conventions-1.25.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz"; - sha512 = "VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.0.tgz"; + sha512 = "M+kkXKRAIAiAP6qYyesfrC5TOmDpDVtsxuGfPcqd9B/iBrac+E14jYwrgm0yZBUIbIP2OnqC3j+UgkXLm1vxUQ=="; }; }; - "@orval/angular-6.29.1" = { + "@orval/angular-6.30.2" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.29.1.tgz"; - sha512 = "nxoDP/m5B+Y5hilxbVHDuCb7LP9WPW250iVuxUHiQLCYFfrQiMJVizIHGZoBS1tx911qbHqFHB7XKHFsGqY1Zw=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.30.2.tgz"; + sha512 = "EzIhuCEDJQIjiaBePI9CA8aU27diKZOb2xp1htX/81TAM9fDu1kKhLKA40i9z3ZcABgfGupm9f+ILIrmk7LDEg=="; }; }; - "@orval/axios-6.29.1" = { + "@orval/axios-6.30.2" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.29.1.tgz"; - sha512 = "qNRfPqSUiuA7m5aUMCBI1+ANJTjHl65ivpLTstfKExf1rvFqZ7gJpGBOGTcxaZdzwBbkN7Zm2CsGBpsWYxDmDg=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.30.2.tgz"; + sha512 = "BGwxqpZembRoM77vd47k/b4LC/prPprK//nEiEvxW2WMmfIdA81UkLHk9IM3EqBjcWD8w5kawwGB13aNlID3Bw=="; }; }; - "@orval/core-6.29.1" = { + "@orval/core-6.30.2" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.29.1.tgz"; - sha512 = "InWH4heF+2KT2e8Qxoa+w8bourNl/MIr2+camJnGbbX6RzsWmfvGCtfW2kiaYMPc4RnGwTg7Qvfqeung2Dj4GQ=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.30.2.tgz"; + sha512 = "+OipnBdCHAKLNvMUAGo8yOrfB1yhk0vsUI44pinL9SlChL+2K48oSl1VZy++O31xFnjXTbtUQWEDlj6pNi4gqg=="; }; }; - "@orval/hono-6.29.1" = { + "@orval/fetch-6.30.2" = { + name = "_at_orval_slash_fetch"; + packageName = "@orval/fetch"; + version = "6.30.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.30.2.tgz"; + sha512 = "YO7L+SRR9AfLvfMkuA4WXWAvXNWecQ+mlQe7S5wvQjZpobxaFAmNwMUEQ51quP3FEHOzzK2Can0Qrb1yY4XxfA=="; + }; + }; + "@orval/hono-6.30.2" = { name = "_at_orval_slash_hono"; packageName = "@orval/hono"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/hono/-/hono-6.29.1.tgz"; - sha512 = "nA4TpWRtGBzDok+BZl6yA4PZbmrXfaasuV0AfM9vmqlpEWn+X/x3ASzOrMBK2OkXc7oDfOToaaiq7CLIfEP8+g=="; + url = "https://registry.npmjs.org/@orval/hono/-/hono-6.30.2.tgz"; + sha512 = "9exEMziYJcgB8l43zpI2R/S9+xBd2G3oc71dGHP8qUossfqWf0l5m7eEbF1Eyy5UrEB2YIwNfKRaUCTSYFlD9Q=="; }; }; - "@orval/mock-6.29.1" = { + "@orval/mock-6.30.2" = { name = "_at_orval_slash_mock"; packageName = "@orval/mock"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/mock/-/mock-6.29.1.tgz"; - sha512 = "l8UEtE1EOX40EHcl4qtu2IeQSRExqc63ekX84BqSWUZx0XicqZRzR348dqd3BB5qaPXKal6Y4ChX3qDeiuDJOw=="; + url = "https://registry.npmjs.org/@orval/mock/-/mock-6.30.2.tgz"; + sha512 = "zWsoLTwNl2x5hto1yEUgdzweaFqpSJ/ZaLIYpkymt7k26oJzDW1UUnmxFAQSHOz26UzzsKFr9/+2bfJjLtQaHw=="; }; }; - "@orval/query-6.29.1" = { + "@orval/query-6.30.2" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.29.1.tgz"; - sha512 = "voJ3WO0AzQmfFxH0iQc2HsKVlzq7cy4Qik8sLT85upehpmJa/UlFjXr23FaW8SKkIG4kS2t80imCmpMfEezTbw=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.30.2.tgz"; + sha512 = "tOHAhVsgkxw2Hy/tFu/VREsnsg+r0IWq6txI4wQac7uJz3AK1SDUD71eNx7tW56noiHT6NnGjODFZdb5s2Cgqg=="; }; }; - "@orval/swr-6.29.1" = { + "@orval/swr-6.30.2" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.29.1.tgz"; - sha512 = "/B7czuGVtWZ9GYeq2E7C8JuoOfd4wm94Qtu0E1gNTSFWgD0rLx3ZSEvR4cmt46t3tUbOw17Ra0k8lJg8T1MPAQ=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.30.2.tgz"; + sha512 = "GFouUCSVerVIKMM+EilNqlHfUyBkq3RhhGQf6fQHlDvUPoVEYRp8PYTKNCQGxyM0Ae0KhZ+g9Uy3faBaXFCxfg=="; }; }; - "@orval/zod-6.29.1" = { + "@orval/zod-6.30.2" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.29.1.tgz"; - sha512 = "CPrcB7HnBoEtFKLvHSHB2vB3f1NlvI/eKd3P0wE7DsCn+c7YBXpRoOPxHpxIER+Y2kFUBh3DqKDLlRtYgg4JHA=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.30.2.tgz"; + sha512 = "nLDjEcuVwIMVfIo6Ku4OYzYmML8ECPPfY1fJ7HV30mp8MGFOnSCVyLZGrVZw5InSwepO1wvh04nHRlAZYoykoA=="; }; }; "@parcel/bundler-default-2.12.0" = { @@ -9067,58 +8860,67 @@ let sha512 = "j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="; }; }; - "@prisma/debug-5.14.0" = { + "@prisma/debug-5.15.0" = { name = "_at_prisma_slash_debug"; packageName = "@prisma/debug"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.14.0.tgz"; - sha512 = "iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w=="; + url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.15.0.tgz"; + sha512 = "QpEAOjieLPc/4sMny/WrWqtpIAmBYsgqwWlWwIctqZO0AbhQ9QcT6x2Ut3ojbDo/pFRCCA1Z1+xm2MUy7fAkZA=="; }; }; - "@prisma/engines-5.14.0" = { + "@prisma/engines-5.15.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.14.0.tgz"; - sha512 = "lgxkKZ6IEygVcw6IZZUlPIfLQ9hjSYAtHjZ5r64sCLDgVzsPFCi2XBBJgzPMkOQ5RHzUD4E/dVdpn9+ez8tk1A=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.15.0.tgz"; + sha512 = "hXL5Sn9hh/ZpRKWiyPA5GbvF3laqBHKt6Vo70hYqqOhh5e0ZXDzHcdmxNvOefEFeqxra2DMz2hNbFoPvqrVe1w=="; }; }; - "@prisma/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48" = { + "@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = { name = "_at_prisma_slash_engines-version"; packageName = "@prisma/engines-version"; - version = "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"; + version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48.tgz"; - sha512 = "ip6pNkRo1UxWv+6toxNcYvItNYaqQjXdFNGJ+Nuk2eYtRoEdoF13wxo7/jsClJFFenMPVNVqXQDV0oveXnR1cA=="; + url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz"; + sha512 = "3BEgZ41Qb4oWHz9kZNofToRvNeS4LZYaT9pienR1gWkjhky6t6K1NyeWNBkqSj2llgraUNbgMOCQPY4f7Qp5wA=="; }; }; - "@prisma/fetch-engine-5.14.0" = { + "@prisma/fetch-engine-5.15.0" = { name = "_at_prisma_slash_fetch-engine"; packageName = "@prisma/fetch-engine"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.14.0.tgz"; - sha512 = "VrheA9y9DMURK5vu8OJoOgQpxOhas3qF0IBHJ8G/0X44k82kc8E0w98HCn2nhnbOOMwbWsJWXfLC2/F8n5u0gQ=="; + url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.15.0.tgz"; + sha512 = "z6AY5yyXxc20Klj7wwnfGP0iIUkVKzybqapT02zLYR/nf9ynaeN8bq73WRmi1TkLYn+DJ5Qy+JGu7hBf1pE78A=="; }; }; - "@prisma/get-platform-5.14.0" = { + "@prisma/get-platform-5.15.0" = { name = "_at_prisma_slash_get-platform"; packageName = "@prisma/get-platform"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.14.0.tgz"; - sha512 = "/yAyBvcEjRv41ynZrhdrPtHgk47xLRRq/o5eWGcUpBJ1YrUZTYB8EoPiopnP7iQrMATK8stXQdPOoVlrzuTQZw=="; + url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.15.0.tgz"; + sha512 = "1GULDkW4+/VQb73vihxCBSc4Chc2x88MA+O40tcZFjmBzG4/fF44PaXFxUqKSFltxU9L9GIMLhh0Gfkk/pUbtg=="; }; }; - "@prisma/prisma-schema-wasm-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48" = { + "@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = { name = "_at_prisma_slash_prisma-schema-wasm"; packageName = "@prisma/prisma-schema-wasm"; - version = "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"; + version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48.tgz"; - sha512 = "WeTmJ0mK8ALoKJUQFO+465k9lm1JWS4ODUg7akJq1wjgyDU1RTAzDFli8ESmNJlMVgJgoAd6jXmzcnoA0HT9Lg=="; + url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz"; + sha512 = "bZYtXnHSP6nkZf20QZm4A/vzz3Psh+u6pMld4t6cdcZlQW0ZOZQ3/WWTOf5Pe+cqS/k4kciEM5urtH2SE01GCg=="; + }; + }; + "@prisma/schema-files-loader-5.15.0" = { + name = "_at_prisma_slash_schema-files-loader"; + packageName = "@prisma/schema-files-loader"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.15.0.tgz"; + sha512 = "ZDIX4Gr5MdGOiik23DSYQ8cOd/Bkat+6yo5TbAF8UlKor9tJsrEVyGRo6DFu1AEvedjSeiwS88jD1dn03sxvyA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -9292,15 +9094,6 @@ let sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg=="; }; }; - "@remix-run/router-1.8.0" = { - name = "_at_remix-run_slash_router"; - packageName = "@remix-run/router"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz"; - sha512 = "mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg=="; - }; - }; "@repeaterjs/repeater-3.0.6" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; @@ -9328,103 +9121,22 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rspack/binding-0.7.0" = { + "@rspack/binding-0.7.3" = { name = "_at_rspack_slash_binding"; packageName = "@rspack/binding"; - version = "0.7.0"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.0.tgz"; - sha512 = "L4bSeF951uJs3e7KakfJJgK0o2TfWsCbaqOQIEa5Aw20olO1I4P7gRK1RZUSlMLXWZ09iF+81Ei7gKQmh1ABLA=="; + url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.3.tgz"; + sha512 = "VYPOtaCb1lphNrHozZXy9L5ODGU76kp7ozCpYbF/CTFq8xaSkvkhNHwWMGXE2TIOvWZImMBRBuYX8/kjz/HiSA=="; }; }; - "@rspack/binding-darwin-arm64-0.7.0" = { - name = "_at_rspack_slash_binding-darwin-arm64"; - packageName = "@rspack/binding-darwin-arm64"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-0.7.0.tgz"; - sha512 = "vh+7sICv2L4hrtRZcoxwdwHRqKPM88PAtq1CcTkACEohOfxnRSJSfSvVYNMbOpqBkSUOQ6v2V9uy2UThtNqvKg=="; - }; - }; - "@rspack/binding-darwin-x64-0.7.0" = { - name = "_at_rspack_slash_binding-darwin-x64"; - packageName = "@rspack/binding-darwin-x64"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-0.7.0.tgz"; - sha512 = "E7cFk/1oMuAqvIsLCAEzI6p+/W3NoZyfSmjQ1s7MV9ylrPtwwzGnMcEbNzcRkemSw1dhxSzlgKT50cl8Pa+mVg=="; - }; - }; - "@rspack/binding-linux-arm64-gnu-0.7.0" = { - name = "_at_rspack_slash_binding-linux-arm64-gnu"; - packageName = "@rspack/binding-linux-arm64-gnu"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.7.0.tgz"; - sha512 = "jcengiNNBm/5u3gUzVduqMBJ2uzUgUE7e9D4WK/gHXSYkk0m25iLxLhDCSnWQKxAgv8Tu71zkOUsiliZqjqJdA=="; - }; - }; - "@rspack/binding-linux-arm64-musl-0.7.0" = { - name = "_at_rspack_slash_binding-linux-arm64-musl"; - packageName = "@rspack/binding-linux-arm64-musl"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.7.0.tgz"; - sha512 = "CHeuGNeztufbHChQ6TyBin4R0iDE0c10J4/7XoX6DiDlDLoFRdB5OF55UeD9g+W/dj1MeZfkW38kezjQdi/vSg=="; - }; - }; - "@rspack/binding-linux-x64-gnu-0.7.0" = { - name = "_at_rspack_slash_binding-linux-x64-gnu"; - packageName = "@rspack/binding-linux-x64-gnu"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.7.0.tgz"; - sha512 = "p0fQaiy9Sdyu3GTd8dfvOeAfyM9y08XuRAQdGDy5AcxZvbHZW/h7Jww5bXdbzIf49p8ojEvLG7qfg953a81n4A=="; - }; - }; - "@rspack/binding-linux-x64-musl-0.7.0" = { - name = "_at_rspack_slash_binding-linux-x64-musl"; - packageName = "@rspack/binding-linux-x64-musl"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-0.7.0.tgz"; - sha512 = "+PwF/Kw40i9+zze/Ys2OhyN2fKcnYGo2V3cp9xTn+8R+CzQhZh9cAU/1DVDJpnTs0p9wKktAp8nIQTcVrWzK7A=="; - }; - }; - "@rspack/binding-win32-arm64-msvc-0.7.0" = { - name = "_at_rspack_slash_binding-win32-arm64-msvc"; - packageName = "@rspack/binding-win32-arm64-msvc"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.7.0.tgz"; - sha512 = "OJj6JHAzdvPeKagLnFcHRTd7/ybERTj7hoAWsagdLsYAB8i/hBIah4U92RArYfQJLkvZbqsiimhGTwTZPh0Miw=="; - }; - }; - "@rspack/binding-win32-ia32-msvc-0.7.0" = { - name = "_at_rspack_slash_binding-win32-ia32-msvc"; - packageName = "@rspack/binding-win32-ia32-msvc"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.7.0.tgz"; - sha512 = "5WBiRi2rvrBbM5HvIgg4iI2H3S9fz89plczKc676iqwcddUAbYYOhQ311q137KqMo3IZ3LQjVia1wxFaXY9oxw=="; - }; - }; - "@rspack/binding-win32-x64-msvc-0.7.0" = { - name = "_at_rspack_slash_binding-win32-x64-msvc"; - packageName = "@rspack/binding-win32-x64-msvc"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.7.0.tgz"; - sha512 = "4j9DFdfEyptC9vNz4CM6IM4z1EInc2dnB3k+YDRtSZDDlOW7jequvhgv+8nSqabeM1sp/GXWkz/rap6jLJKMpA=="; - }; - }; - "@rspack/core-0.7.0" = { + "@rspack/core-0.7.3" = { name = "_at_rspack_slash_core"; packageName = "@rspack/core"; - version = "0.7.0"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.0.tgz"; - sha512 = "1KsI17Ejx5jGrMO+iApvXLfH2l0KDwXhWsLlbvHQ2/RKAx6qjvw8qoE18etBQYEcgh1bzruuRiNBLkKnk5nf7A=="; + url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.3.tgz"; + sha512 = "SUvt4P1nMML3Int2YE1Z2+noDIxjT/hzNtcKMXXqeFp4yFys37s7vC+BnCyzonvIbpxUg2gH+bCMCgav7+xR4A=="; }; }; "@rushstack/heft-config-file-0.14.25" = { @@ -9454,13 +9166,13 @@ let sha512 = "mI0tKuBPiTO2pBzAO+M2aHZVlje0Oz37iEtuycOUMUvsy2igv6T6XWNrRs/kPfQ5lhZ8XGTZOEEZ4Gbb7UESgw=="; }; }; - "@rushstack/package-extractor-0.7.15" = { + "@rushstack/package-extractor-0.7.16" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.7.15"; + version = "0.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.15.tgz"; - sha512 = "6YIFz5a4c2MuJHHAT9/J4BT1hUJR/6yB/evUPowY/iVV1rmoMKRGXuJmfB8szoEbdR7eJzCm/lPEUi5CFDr7Qg=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.16.tgz"; + sha512 = "QQfjc84Gdvqq0k08852orNFIaAj1N7310H/r8KMYyjXfVRWgVlP55QIGzps7KQWDfjlq72UDPu85kEGrav2ekw=="; }; }; "@rushstack/rig-package-0.5.2" = { @@ -9472,40 +9184,40 @@ let sha512 = "mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.127.0" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.127.0.tgz"; - sha512 = "L655r9l1wbDPlVHD7c4akktpMrzmBqmPkO7wIfghcu7E3tiqjEWnghhI8WUeHNHxIuXba2m9z27Q0YdiIwen2w=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.128.1.tgz"; + sha512 = "RWlix06urImT73M2rZmM4Yi8T2gHufiQ2ghLMLaz5m/5FwwUavppXeTkiTXSIsIv42nzdu/MKtVknXNfjfQBAg=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.127.0" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.128.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.127.0.tgz"; - sha512 = "O25kE8cP/Fvb6YWx1tDXQMnFA3L62m70J4pj/r2/QI0z+LvirQBKim+M+qLmdEQoK8LqBXL6lXiLLmdvsBVwhw=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.128.1.tgz"; + sha512 = "J8k9ZH8GlJTtkZT0W9D/nvi4kQX1bUM/8PyQyA0/MUYoCNxWEImGjR0IHOXn30WC1m/DrU7J73NHh3d+2p3XSg=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.127.0" = { + "@rushstack/rush-http-build-cache-plugin-5.128.1" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.127.0.tgz"; - sha512 = "4Da2EGR2ddc4Xzh+h01aD0uenRJaRQSc1MzNBiXzbVJuORwaW1emXR71K0E+p/I2ZUWznE1w297GyS82lmXOag=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.128.1.tgz"; + sha512 = "LlCJo3BYcIsoO85qgHtXtIpEriKc0gnoSkkkH30wy5N1AKIqIL3iUvQtxDl6WmcwtlBmHqYem4W4nw2B2Vh1wg=="; }; }; - "@rushstack/rush-sdk-5.127.0" = { + "@rushstack/rush-sdk-5.128.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.127.0.tgz"; - sha512 = "JFr0AS78MRkwCeNo09o7yKGO8t4WdtS3i9xZkYo0RBaOjy8LVuCEZcvyB4kgbBe9XidN5modH8Z1kX+fLWrvsg=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.128.1.tgz"; + sha512 = "oYrKFX54FsXpbsA03fRp/3gLAgVXWXYMIOxgi4zHb4XBs4+6p4OGa3fLAjNY4SNWaQIv6AiokU7pPCAt9bJHDg=="; }; }; "@rushstack/stream-collator-4.1.56" = { @@ -9544,40 +9256,49 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-18.0.2" = { + "@schematics/angular-18.0.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "18.0.2"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.0.2.tgz"; - sha512 = "qkJs1oxHtneJ6QxDKpxNyneXGDM9SKVj+Bgi8xUAU3FEzpsYmE/aW3MfwYHOZl0pDBO8c2raqLvlyl3dGP6/Gg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.0.4.tgz"; + sha512 = "fN4whuym9ZmcQFdTfwLZr4j+NcZ4LzbdLk8XYrYdxt1z8c9ujs5LqJYn0LYc3UWiYl7z2RVc9NOxzNrkiXdwlw=="; }; }; - "@scure/base-1.1.6" = { + "@scure/base-1.1.7" = { name = "_at_scure_slash_base"; packageName = "@scure/base"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@scure/base/-/base-1.1.6.tgz"; - sha512 = "ok9AWwhcgYuGG3Zfhyqg+zwl+Wn5uE+dwC0NV/2qQkx4dABbb/bx96vWu8NSj+BNjjSjno+JRYRjle1jV08k3g=="; + url = "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz"; + sha512 = "PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g=="; }; }; - "@scure/bip32-1.3.3" = { + "@scure/bip32-1.4.0" = { name = "_at_scure_slash_bip32"; packageName = "@scure/bip32"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.3.tgz"; - sha512 = "LJaN3HwRbfQK0X1xFSi0Q9amqOgzQnnDngIt+ZlsBC3Bm7/nE7K0kwshZHyaru79yIVRv/e1mQAjZyuZG6jOFQ=="; + url = "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz"; + sha512 = "sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg=="; }; }; - "@scure/bip39-1.2.2" = { + "@scure/bip39-1.3.0" = { name = "_at_scure_slash_bip39"; packageName = "@scure/bip39"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.2.tgz"; - sha512 = "HYf9TUXG80beW+hGAt3TRM8wU6pQoYur9iNypTROm42dorCGmLnFe3eWjz3gOq6G62H2WRh0FCzAR1PI+29zIA=="; + url = "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz"; + sha512 = "disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ=="; + }; + }; + "@sec-ant/readable-stream-0.4.1" = { + name = "_at_sec-ant_slash_readable-stream"; + packageName = "@sec-ant/readable-stream"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz"; + sha512 = "831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg=="; }; }; "@segment/ajv-human-errors-2.12.0" = { @@ -9922,13 +9643,22 @@ let sha512 = "LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg=="; }; }; - "@smithy/abort-controller-3.0.0" = { + "@sindresorhus/merge-streams-4.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz"; + sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ=="; + }; + }; + "@smithy/abort-controller-3.0.1" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "p6GlFGBt9K4MYLu72YuJ523NVR4A8oHlC5M2JO6OmQqN8kAc/uh1JqLE+FizTokrSJGg0CSvC+BrsmGzKtsZKA=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.0.1.tgz"; + sha512 = "Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA=="; }; }; "@smithy/chunked-blob-reader-3.0.0" = { @@ -9949,121 +9679,130 @@ let sha512 = "VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg=="; }; }; - "@smithy/config-resolver-3.0.1" = { + "@smithy/config-resolver-3.0.2" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.1.tgz"; - sha512 = "hbkYJc20SBDz2qqLzttjI/EqXemtmWk0ooRznLsiXp3066KQRTvuKHa7U4jCZCJq6Dozqvy0R1/vNESC9inPJg=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.2.tgz"; + sha512 = "wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g=="; }; }; - "@smithy/core-2.1.1" = { + "@smithy/core-2.2.1" = { name = "_at_smithy_slash_core"; packageName = "@smithy/core"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/core/-/core-2.1.1.tgz"; - sha512 = "0vbIwwUcg0FMhTVJgMhbsRSAFL0rwduy/OQz7Xq1pJXJOyaGv+PGjj1iGawRlzBUPA5BkJv7S6q+YU2U8gk/WA=="; + url = "https://registry.npmjs.org/@smithy/core/-/core-2.2.1.tgz"; + sha512 = "R8Pzrr2v2oGUoj4CTZtKPr87lVtBsz7IUBGhSwS1kc6Cj0yPwNdYbkzhFsxhoDE9+BPl09VN/6rFsW9GJzWnBA=="; }; }; - "@smithy/credential-provider-imds-3.1.0" = { + "@smithy/credential-provider-imds-3.1.1" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.0.tgz"; - sha512 = "q4A4d38v8pYYmseu/jTS3Z5I3zXlEOe5Obi+EJreVKgSVyWUHOd7/yaVCinC60QG4MRyCs98tcxBH1IMC0bu7Q=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz"; + sha512 = "htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g=="; }; }; - "@smithy/eventstream-codec-3.0.0" = { + "@smithy/eventstream-codec-3.1.0" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.0.0.tgz"; - sha512 = "PUtyEA0Oik50SaEFCZ0WPVtF9tz/teze2fDptW6WRXl+RrEenH8UbEjudOz8iakiMl3lE3lCVqYf2Y+znL8QFQ=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.0.tgz"; + sha512 = "XFDl70ZY+FabSnTX3oQGGYvdbEaC8vPEFkCEOoBkumqaZIwR1WjjJCDu2VMXlHbKWKshefWXdT0NYteL5v6uFw=="; }; }; - "@smithy/eventstream-serde-browser-3.0.0" = { + "@smithy/eventstream-serde-browser-3.0.2" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.0.tgz"; - sha512 = "NB7AFiPN4NxP/YCAnrvYR18z2/ZsiHiF7VtG30gshO9GbFrIb1rC8ep4NGpJSWrz6P64uhPXeo4M0UsCLnZKqw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.2.tgz"; + sha512 = "6147vdedQGaWn3Nt4P1KV0LuV8IH4len1SAeycyko0p8oRLWFyYyx0L8JHGclePDSphkjxZqBHtyIfyupCaTGg=="; }; }; - "@smithy/eventstream-serde-config-resolver-3.0.0" = { + "@smithy/eventstream-serde-config-resolver-3.0.1" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.0.tgz"; - sha512 = "RUQG3vQ3LX7peqqHAbmayhgrF5aTilPnazinaSGF1P0+tgM3vvIRWPHmlLIz2qFqB9LqFIxditxc8O2Z6psrRw=="; - }; - }; - "@smithy/eventstream-serde-node-3.0.0" = { - name = "_at_smithy_slash_eventstream-serde-node"; - packageName = "@smithy/eventstream-serde-node"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.0.tgz"; - sha512 = "baRPdMBDMBExZXIUAoPGm/hntixjt/VFpU6+VmCyiYJYzRHRxoaI1MN+5XE+hIS8AJ2GCHLMFEIOLzq9xx1EgQ=="; - }; - }; - "@smithy/eventstream-serde-universal-3.0.0" = { - name = "_at_smithy_slash_eventstream-serde-universal"; - packageName = "@smithy/eventstream-serde-universal"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.0.tgz"; - sha512 = "HNFfShmotWGeAoW4ujP8meV9BZavcpmerDbPIjkJbxKbN8RsUcpRQ/2OyIxWNxXNH2GWCAxuSB7ynmIGJlQ3Dw=="; - }; - }; - "@smithy/fetch-http-handler-3.0.1" = { - name = "_at_smithy_slash_fetch-http-handler"; - packageName = "@smithy/fetch-http-handler"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.1.tgz"; - sha512 = "uaH74i5BDj+rBwoQaXioKpI0SHBJFtOVwzrCpxZxphOW0ki5jhj7dXvDMYM2IJem8TpdFvS2iC08sjOblfFGFg=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.1.tgz"; + sha512 = "6+B8P+5Q1mll4u7IoI7mpmYOSW3/c2r3WQoYLdqOjbIKMixJFGmN79ZjJiNMy4X2GZ4We9kQ6LfnFuczSlhcyw=="; }; }; - "@smithy/hash-blob-browser-3.0.0" = { + "@smithy/eventstream-serde-node-3.0.2" = { + name = "_at_smithy_slash_eventstream-serde-node"; + packageName = "@smithy/eventstream-serde-node"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.2.tgz"; + sha512 = "DLtmGAfqxZAql8rB+HqyPlUne22u3EEVj+hxlUjgXk0hXt+SfLGK0ljzRFmiWQ3qGpHu1NdJpJA9e5JE/dJxFw=="; + }; + }; + "@smithy/eventstream-serde-universal-3.0.2" = { + name = "_at_smithy_slash_eventstream-serde-universal"; + packageName = "@smithy/eventstream-serde-universal"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.2.tgz"; + sha512 = "d3SgAIQ/s4EbU8HAHJ8m2MMJPAL30nqJktyVgvqZWNznA8PJl61gJw5gj/yjIt/Fvs3d4fU8FmPPAhdp2yr/7A=="; + }; + }; + "@smithy/fetch-http-handler-3.0.2" = { + name = "_at_smithy_slash_fetch-http-handler"; + packageName = "@smithy/fetch-http-handler"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.2.tgz"; + sha512 = "0nW6tLK0b7EqSsfKvnOmZCgJqnodBAnvqcrlC5dotKfklLedPTRGsQamSVbVDWyuU/QGg+YbZDJUQ0CUufJXZQ=="; + }; + }; + "@smithy/hash-blob-browser-3.1.0" = { name = "_at_smithy_slash_hash-blob-browser"; packageName = "@smithy/hash-blob-browser"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.0.0.tgz"; - sha512 = "/Wbpdg+bwJvW7lxR/zpWAc1/x/YkcqguuF2bAzkJrvXriZu1vm8r+PUdE4syiVwQg7PPR2dXpi3CLBb9qRDaVQ=="; + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.0.tgz"; + sha512 = "lKEHDN6bLzYdx5cFmdMHfYVmmTZTmjphwPBSumgkaniEYwRAXnbDEGETeuzfquS9Py1aH6cmqzXWxxkD7mV3sA=="; }; }; - "@smithy/hash-node-3.0.0" = { + "@smithy/hash-node-3.0.1" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.0.tgz"; - sha512 = "84qXstNemP3XS5jcof0el6+bDfjzuvhJPQTEfro3lgtbCtKgzPm3MgiS6ehXVPjeQ5+JS0HqmTz8f/RYfzHVxw=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.1.tgz"; + sha512 = "w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg=="; }; }; - "@smithy/hash-stream-node-3.0.0" = { + "@smithy/hash-stream-node-3.1.0" = { name = "_at_smithy_slash_hash-stream-node"; packageName = "@smithy/hash-stream-node"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.0.0.tgz"; - sha512 = "J0i7de+EgXDEGITD4fxzmMX8CyCNETTIRXlxjMiNUvvu76Xn3GJ31wQR85ynlPk2wI1lqoknAFJaD1fiNDlbIA=="; + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.0.tgz"; + sha512 = "OkU9vjN17yYsXTSrouctZn2iYwG4z8WSc7F50+9ogG2crOtMopkop+22j35tX2ry2i/vLRCYgnqEmBWfvnYT2g=="; }; }; - "@smithy/invalid-dependency-3.0.0" = { + "@smithy/invalid-dependency-3.0.1" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.0.tgz"; - sha512 = "F6wBBaEFgJzj0s4KUlliIGPmqXemwP6EavgvDqYwCH40O5Xr2iMHvS8todmGVZtuJCorBkXsYLyTu4PuizVq5g=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz"; + sha512 = "RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA=="; + }; + }; + "@smithy/is-array-buffer-2.2.0" = { + name = "_at_smithy_slash_is-array-buffer"; + packageName = "@smithy/is-array-buffer"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz"; + sha512 = "GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="; }; }; "@smithy/is-array-buffer-3.0.0" = { @@ -10075,166 +9814,166 @@ let sha512 = "+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="; }; }; - "@smithy/md5-js-3.0.0" = { + "@smithy/md5-js-3.0.1" = { name = "_at_smithy_slash_md5-js"; packageName = "@smithy/md5-js"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.0.tgz"; - sha512 = "Tm0vrrVzjlD+6RCQTx7D3Ls58S3FUH1ZCtU1MIh/qQmaOo1H9lMN2as6CikcEwgattnA9SURSdoJJ27xMcEfMA=="; - }; - }; - "@smithy/middleware-content-length-3.0.0" = { - name = "_at_smithy_slash_middleware-content-length"; - packageName = "@smithy/middleware-content-length"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.0.tgz"; - sha512 = "3C4s4d/iGobgCtk2tnWW6+zSTOBg1PRAm2vtWZLdriwTroFbbWNSr3lcyzHdrQHnEXYCC5K52EbpfodaIUY8sg=="; - }; - }; - "@smithy/middleware-endpoint-3.0.1" = { - name = "_at_smithy_slash_middleware-endpoint"; - packageName = "@smithy/middleware-endpoint"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.1.tgz"; - sha512 = "lQ/UOdGD4KM5kLZiAl0q8Qy3dPbynvAXKAdXnYlrA1OpaUwr+neSsVokDZpY6ZVb5Yx8jnus29uv6XWpM9P4SQ=="; + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.1.tgz"; + sha512 = "wQa0YGsR4Zb1GQLGwOOgRAbkj22P6CFGaFzu5bKk8K4HVNIC2dBlIxqZ/baF0pLiSZySAPdDZT7CdZ7GkGXt5A=="; }; }; - "@smithy/middleware-retry-3.0.3" = { + "@smithy/middleware-content-length-3.0.1" = { + name = "_at_smithy_slash_middleware-content-length"; + packageName = "@smithy/middleware-content-length"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz"; + sha512 = "6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ=="; + }; + }; + "@smithy/middleware-endpoint-3.0.2" = { + name = "_at_smithy_slash_middleware-endpoint"; + packageName = "@smithy/middleware-endpoint"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz"; + sha512 = "gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w=="; + }; + }; + "@smithy/middleware-retry-3.0.4" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.3.tgz"; - sha512 = "Wve1qzJb83VEU/6q+/I0cQdAkDnuzELC6IvIBwDzUEiGpKqXgX1v10FUuZGbRS6Ov/P+HHthcAoHOJZQvZNAkA=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.4.tgz"; + sha512 = "Tu+FggbLNF5G9L6Wi8o32Mg4bhlBInWlhhaFKyytGRnkfxGopxFVXJQn7sjZdFYJyTz6RZZa06tnlvavUgtoVg=="; }; }; - "@smithy/middleware-serde-3.0.0" = { + "@smithy/middleware-serde-3.0.1" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.0.tgz"; - sha512 = "I1vKG1foI+oPgG9r7IMY1S+xBnmAn1ISqployvqkwHoSb8VPsngHDTOgYGYBonuOKndaWRUGJZrKYYLB+Ane6w=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz"; + sha512 = "ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw=="; }; }; - "@smithy/middleware-stack-3.0.0" = { + "@smithy/middleware-stack-3.0.1" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.0.tgz"; - sha512 = "+H0jmyfAyHRFXm6wunskuNAqtj7yfmwFB6Fp37enytp2q047/Od9xetEaUbluyImOlGnGpaVGaVfjwawSr+i6Q=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz"; + sha512 = "fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA=="; }; }; - "@smithy/node-config-provider-3.1.0" = { + "@smithy/node-config-provider-3.1.1" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.0.tgz"; - sha512 = "ngfB8QItUfTFTfHMvKuc2g1W60V1urIgZHqD1JNFZC2tTWXahqf2XvKXqcBS7yZqR7GqkQQZy11y/lNOUWzq7Q=="; - }; - }; - "@smithy/node-http-handler-3.0.0" = { - name = "_at_smithy_slash_node-http-handler"; - packageName = "@smithy/node-http-handler"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.0.0.tgz"; - sha512 = "3trD4r7NOMygwLbUJo4eodyQuypAWr7uvPnebNJ9a70dQhVn+US8j/lCnvoJS6BXfZeF7PkkkI0DemVJw+n+eQ=="; - }; - }; - "@smithy/property-provider-3.1.0" = { - name = "_at_smithy_slash_property-provider"; - packageName = "@smithy/property-provider"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.0.tgz"; - sha512 = "Tj3+oVhqdZgemjCiWjFlADfhvLF4C/uKDuKo7/tlEsRQ9+3emCreR2xndj970QSRSsiCEU8hZW3/8JQu+n5w4Q=="; - }; - }; - "@smithy/protocol-http-4.0.0" = { - name = "_at_smithy_slash_protocol-http"; - packageName = "@smithy/protocol-http"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.0.tgz"; - sha512 = "qOQZOEI2XLWRWBO9AgIYuHuqjZ2csyr8/IlgFDHDNuIgLAMRx2Bl8ck5U5D6Vh9DPdoaVpuzwWMa0xcdL4O/AQ=="; - }; - }; - "@smithy/querystring-builder-3.0.0" = { - name = "_at_smithy_slash_querystring-builder"; - packageName = "@smithy/querystring-builder"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.0.tgz"; - sha512 = "bW8Fi0NzyfkE0TmQphDXr1AmBDbK01cA4C1Z7ggwMAU5RDz5AAv/KmoRwzQAS0kxXNf/D2ALTEgwK0U2c4LtRg=="; - }; - }; - "@smithy/querystring-parser-3.0.0" = { - name = "_at_smithy_slash_querystring-parser"; - packageName = "@smithy/querystring-parser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.0.tgz"; - sha512 = "UzHwthk0UEccV4dHzPySnBy34AWw3V9lIqUTxmozQ+wPDAO9csCWMfOLe7V9A2agNYy7xE+Pb0S6K/J23JSzfQ=="; - }; - }; - "@smithy/service-error-classification-3.0.0" = { - name = "_at_smithy_slash_service-error-classification"; - packageName = "@smithy/service-error-classification"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.0.tgz"; - sha512 = "3BsBtOUt2Gsnc3X23ew+r2M71WwtpHfEDGhHYHSDg6q1t8FrWh15jT25DLajFV1H+PpxAJ6gqe9yYeRUsmSdFA=="; - }; - }; - "@smithy/shared-ini-file-loader-3.1.0" = { - name = "_at_smithy_slash_shared-ini-file-loader"; - packageName = "@smithy/shared-ini-file-loader"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.0.tgz"; - sha512 = "dAM7wSX0NR3qTNyGVN/nwwpEDzfV9T/3AN2eABExWmda5VqZKSsjlINqomO5hjQWGv+IIkoXfs3u2vGSNz8+Rg=="; - }; - }; - "@smithy/signature-v4-3.0.0" = { - name = "_at_smithy_slash_signature-v4"; - packageName = "@smithy/signature-v4"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.0.0.tgz"; - sha512 = "kXFOkNX+BQHe2qnLxpMEaCRGap9J6tUGLzc3A9jdn+nD4JdMwCKTJ+zFwQ20GkY+mAXGatyTw3HcoUlR39HwmA=="; - }; - }; - "@smithy/smithy-client-3.1.1" = { - name = "_at_smithy_slash_smithy-client"; - packageName = "@smithy/smithy-client"; version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.1.tgz"; - sha512 = "tj4Ku7MpzZR8cmVuPcSbrLFVxmptWktmJMwST/uIEq4sarabEdF8CbmQdYB7uJ/X51Qq2EYwnRsoS7hdR4B7rA=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz"; + sha512 = "z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA=="; }; }; - "@smithy/types-3.0.0" = { + "@smithy/node-http-handler-3.0.1" = { + name = "_at_smithy_slash_node-http-handler"; + packageName = "@smithy/node-http-handler"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz"; + sha512 = "hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA=="; + }; + }; + "@smithy/property-provider-3.1.1" = { + name = "_at_smithy_slash_property-provider"; + packageName = "@smithy/property-provider"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.1.tgz"; + sha512 = "YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw=="; + }; + }; + "@smithy/protocol-http-4.0.1" = { + name = "_at_smithy_slash_protocol-http"; + packageName = "@smithy/protocol-http"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.1.tgz"; + sha512 = "eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg=="; + }; + }; + "@smithy/querystring-builder-3.0.1" = { + name = "_at_smithy_slash_querystring-builder"; + packageName = "@smithy/querystring-builder"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz"; + sha512 = "vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q=="; + }; + }; + "@smithy/querystring-parser-3.0.1" = { + name = "_at_smithy_slash_querystring-parser"; + packageName = "@smithy/querystring-parser"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz"; + sha512 = "Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q=="; + }; + }; + "@smithy/service-error-classification-3.0.1" = { + name = "_at_smithy_slash_service-error-classification"; + packageName = "@smithy/service-error-classification"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz"; + sha512 = "ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA=="; + }; + }; + "@smithy/shared-ini-file-loader-3.1.1" = { + name = "_at_smithy_slash_shared-ini-file-loader"; + packageName = "@smithy/shared-ini-file-loader"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz"; + sha512 = "nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g=="; + }; + }; + "@smithy/signature-v4-3.1.0" = { + name = "_at_smithy_slash_signature-v4"; + packageName = "@smithy/signature-v4"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.0.tgz"; + sha512 = "m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg=="; + }; + }; + "@smithy/smithy-client-3.1.2" = { + name = "_at_smithy_slash_smithy-client"; + packageName = "@smithy/smithy-client"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.2.tgz"; + sha512 = "f3eQpczBOFUtdT/ptw2WpUKu1qH1K7xrssrSiHYtd9TuLXkvFqb88l9mz9FHeUVNSUxSnkW1anJnw6rLwUKzQQ=="; + }; + }; + "@smithy/types-3.1.0" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-3.0.0.tgz"; - sha512 = "VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-3.1.0.tgz"; + sha512 = "qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw=="; }; }; - "@smithy/url-parser-3.0.0" = { + "@smithy/url-parser-3.0.1" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.0.tgz"; - sha512 = "2XLazFgUu+YOGHtWihB3FSLAfCUajVfNBXGGYjOaVKjLAuAxx3pSBY3hBgLzIgB17haf59gOG3imKqTy8mcrjw=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.1.tgz"; + sha512 = "G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg=="; }; }; "@smithy/util-base64-3.0.0" = { @@ -10264,6 +10003,15 @@ let sha512 = "Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA=="; }; }; + "@smithy/util-buffer-from-2.2.0" = { + name = "_at_smithy_slash_util-buffer-from"; + packageName = "@smithy/util-buffer-from"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz"; + sha512 = "IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="; + }; + }; "@smithy/util-buffer-from-3.0.0" = { name = "_at_smithy_slash_util-buffer-from"; packageName = "@smithy/util-buffer-from"; @@ -10282,31 +10030,31 @@ let sha512 = "pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="; }; }; - "@smithy/util-defaults-mode-browser-3.0.3" = { + "@smithy/util-defaults-mode-browser-3.0.4" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.3.tgz"; - sha512 = "3DFON2bvXJAukJe+qFgPV/rorG7ZD3m4gjCXHD1V5z/tgKQp5MCTCLntrd686tX6tj8Uli3lefWXJudNg5WmCA=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.4.tgz"; + sha512 = "sXtin3Mue3A3xo4+XkozpgPptgmRwvNPOqTvb3ANGTCzzoQgAPBNjpE+aXCINaeSMXwHmv7E2oEn2vWdID+SAQ=="; }; }; - "@smithy/util-defaults-mode-node-3.0.3" = { + "@smithy/util-defaults-mode-node-3.0.4" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.3.tgz"; - sha512 = "D0b8GJXecT00baoSQ3Iieu3k3mZ7GY8w1zmg8pdogYrGvWJeLcIclqk2gbkG4K0DaBGWrO6v6r20iwIFfDYrmA=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.4.tgz"; + sha512 = "CUF6TyxLh3CgBRVYgZNOPDfzHQjeQr0vyALR6/DkQkOm7rNfGEzW1BRFi88C73pndmfvoiIT7ochuT76OPz9Dw=="; }; }; - "@smithy/util-endpoints-2.0.1" = { + "@smithy/util-endpoints-2.0.2" = { name = "_at_smithy_slash_util-endpoints"; packageName = "@smithy/util-endpoints"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.1.tgz"; - sha512 = "ZRT0VCOnKlVohfoABMc8lWeQo/JEFuPWctfNRXgTHbyOVssMOLYFUNWukxxiHRGVAhV+n3c0kPW+zUqckjVPEA=="; + url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz"; + sha512 = "4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg=="; }; }; "@smithy/util-hex-encoding-3.0.0" = { @@ -10318,31 +10066,31 @@ let sha512 = "eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="; }; }; - "@smithy/util-middleware-3.0.0" = { + "@smithy/util-middleware-3.0.1" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.0.tgz"; - sha512 = "q5ITdOnV2pXHSVDnKWrwgSNTDBAMHLptFE07ua/5Ty5WJ11bvr0vk2a7agu7qRhrCFRQlno5u3CneU5EELK+DQ=="; - }; - }; - "@smithy/util-retry-3.0.0" = { - name = "_at_smithy_slash_util-retry"; - packageName = "@smithy/util-retry"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.0.tgz"; - sha512 = "nK99bvJiziGv/UOKJlDvFF45F00WgPLKVIGUfAK+mDhzVN2hb/S33uW2Tlhg5PVBoqY7tDVqL0zmu4OxAHgo9g=="; - }; - }; - "@smithy/util-stream-3.0.1" = { - name = "_at_smithy_slash_util-stream"; - packageName = "@smithy/util-stream"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.1.tgz"; - sha512 = "7F7VNNhAsfMRA8I986YdOY5fE0/T1/ZjFF6OLsqkvQVNP3vZ/szYDfGCyphb7ioA09r32K/0qbSFfNFU68aSzA=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.1.tgz"; + sha512 = "WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ=="; + }; + }; + "@smithy/util-retry-3.0.1" = { + name = "_at_smithy_slash_util-retry"; + packageName = "@smithy/util-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.1.tgz"; + sha512 = "5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw=="; + }; + }; + "@smithy/util-stream-3.0.2" = { + name = "_at_smithy_slash_util-stream"; + packageName = "@smithy/util-stream"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.2.tgz"; + sha512 = "n5Obp5AnlI6qHo8sbupwrcpBe6vFp4qkl0SRNuExKPNrH3ABAMG2ZszRTIUIv2b4AsFrCO+qiy4uH1Q3z1dxTA=="; }; }; "@smithy/util-uri-escape-3.0.0" = { @@ -10354,6 +10102,15 @@ let sha512 = "LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg=="; }; }; + "@smithy/util-utf8-2.3.0" = { + name = "_at_smithy_slash_util-utf8"; + packageName = "@smithy/util-utf8"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz"; + sha512 = "R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="; + }; + }; "@smithy/util-utf8-3.0.0" = { name = "_at_smithy_slash_util-utf8"; packageName = "@smithy/util-utf8"; @@ -10363,13 +10120,13 @@ let sha512 = "rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="; }; }; - "@smithy/util-waiter-3.0.0" = { + "@smithy/util-waiter-3.0.1" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.0.0.tgz"; - sha512 = "+fEXJxGDLCoqRKVSmo0auGxaqbiCo+8oph+4auefYjaNxjOLKSY2MxVQfRzo65PaZv4fr+5lWg+au7vSuJJ/zw=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.0.1.tgz"; + sha512 = "wwnrVQdjQxvWGOAiLmqlEhENGCcDIN+XJ/+usPOgSZObAslrCXgKlkX7rNVwIWW2RhPguTKthvF+4AoO0Z6KpA=="; }; }; "@socket.io/component-emitter-3.1.2" = { @@ -10453,13 +10210,13 @@ let sha512 = "X27qhUfNluiduH0u/QwJqhOd8Wk5YKdxVmKM03Aijlx0AH1H5mYt3l9r7t2L4iyJrsBaFPnMGt7UYJDGxszbNA=="; }; }; - "@stoplight/spectral-functions-1.7.2" = { + "@stoplight/spectral-functions-1.8.0" = { name = "_at_stoplight_slash_spectral-functions"; packageName = "@stoplight/spectral-functions"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.7.2.tgz"; - sha512 = "f+61/FtIkQeIo+a269CeaeqjpyRsgDyIk6DGr7iS4hyuk1PPk7Uf6MNRDs9FEIBh7CpdEJ+HSHbMLwgpymWTIw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.8.0.tgz"; + sha512 = "ZrAkYA/ZGbuQ6EyG1gisF4yQ5nWP/+glcqVoGmS6kH6ekaynz2Yp6FL0oIamWj3rWedFUN7ppwTRUdo+9f/uCw=="; }; }; "@stoplight/spectral-parsers-1.0.4" = { @@ -10480,13 +10237,13 @@ let sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; - "@stoplight/spectral-rulesets-1.18.1" = { + "@stoplight/spectral-rulesets-1.19.1" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.18.1"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.18.1.tgz"; - sha512 = "buLzYi4rHjZOG2d5LC/s3YpySrCGrwR4irKDyrxLlbbqmB8BDOsrdO+7G9UGvRCJwAy/xs1VWcjokzGnG68K+Q=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.19.1.tgz"; + sha512 = "rfGK87Y1JJCEeLC8MVdLkjUkRH+Y6VnSF388D+UWihfU9xuq2eNB9phWpTFkG+AG4HLRyGx963BmO6PyM9dBag=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -10588,13 +10345,13 @@ let sha512 = "emB5l2nZsXjUEAuusqjYvWnQMLWZp6K039Mv8aq5SX1rsNM/N7DNhw1i4/DX7AyzNZ0tT+ASWyTvqEURldp5HA=="; }; }; - "@swc-node/register-1.9.1" = { + "@swc-node/register-1.9.2" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.9.1.tgz"; - sha512 = "z//TBXJdRWXoISCXlQmVz+NMm8Qm/UvcfKiGC0tSJdfeVYf5EZkGqvk2OiRH4SIJ6OGFfS9T0YrvA2pDKzWtPA=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.9.2.tgz"; + sha512 = "BBjg0QNuEEmJSoU/++JOXhrjWdu3PTyYeJWsvchsI0Aqtj8ICkz/DqlwtXbmZVZ5vuDPpTfFlwDBZe81zgShMA=="; }; }; "@swc-node/sourcemap-support-0.5.0" = { @@ -10606,13 +10363,13 @@ let sha512 = "fbhjL5G0YvFoWwNhWleuBUfotiX+USiA9oJqu9STFw+Hb0Cgnddn+HVS/K5fI45mn92e8V+cHD2jgFjk4w2T9Q=="; }; }; - "@swc/core-1.5.24" = { + "@swc/core-1.5.29" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.5.24"; + version = "1.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.5.24.tgz"; - sha512 = "Eph9zvO4xvqWZGVzTdtdEJ0Vqf0VIML/o/e4Qd2RLOqtfgnlRi7avmMu5C0oqciJ0tk+hqdUKVUZ4JPoPaiGvQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.5.29.tgz"; + sha512 = "nvTtHJI43DUSOAf3h9XsqYg8YXKc0/N4il9y4j0xAkO0ekgDNo+3+jbw6MInawjKJF9uulyr+f5bAutTsOKVlw=="; }; }; "@swc/counter-0.1.3" = { @@ -10633,22 +10390,22 @@ let sha512 = "YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A=="; }; }; - "@swc/types-0.1.7" = { + "@swc/types-0.1.8" = { name = "_at_swc_slash_types"; packageName = "@swc/types"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/types/-/types-0.1.7.tgz"; - sha512 = "scHWahbHF0eyj3JsxG9CFJgFdFNaVQCNAimBlT6PzS3n/HptxqREjsm4OH6AN3lYcffZYSPxXW8ua2BEHp0lJQ=="; + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.8.tgz"; + sha512 = "RNFA3+7OJFNYY78x0FYwi1Ow+iF1eF5WvmfY1nXPOEH4R2p/D4Cr1vzje7dNAI2aLFqpv8Wyz4oKSWqIZArpQA=="; }; }; - "@swc/wasm-1.5.24" = { + "@swc/wasm-1.5.29" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.5.24"; + version = "1.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.5.24.tgz"; - sha512 = "LyJpKUQE0E/4gbS/F7lB5t5h67cU5B6Ov2aTYdPknOA9+Yg6ra9Gyt8BnJZAus7qRlHgofNMA/dj87Mtubzpaw=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.5.29.tgz"; + sha512 = "uCvf2Sm9lGcwtqAoeB8Huh9POeM1tZqoMRwkQrdhUwaysNaeQJhCAU0zx5KeDjVna8W8/ELjgZW7HHZSw8Ifhw=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10678,33 +10435,6 @@ let sha512 = "+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw=="; }; }; - "@tailwindcss/forms-0.5.7" = { - name = "_at_tailwindcss_slash_forms"; - packageName = "@tailwindcss/forms"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz"; - sha512 = "QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw=="; - }; - }; - "@tanstack/react-virtual-3.5.0" = { - name = "_at_tanstack_slash_react-virtual"; - packageName = "@tanstack/react-virtual"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.5.0.tgz"; - sha512 = "rtvo7KwuIvqK9zb0VZ5IL7fiJAEnG+0EiFZz8FUOs+2mhGqdGmjKIaT1XU7Zq0eFqL0jonLlhbayJI/J2SA/Bw=="; - }; - }; - "@tanstack/virtual-core-3.5.0" = { - name = "_at_tanstack_slash_virtual-core"; - packageName = "@tanstack/virtual-core"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.5.0.tgz"; - sha512 = "KnPRCkQTyqhanNC0K63GBG3wA8I+D1fQuVnAvcBF8f13akOKeQp1gSbu6f77zCxhEk727iV5oQnbHLYzHrECLg=="; - }; - }; "@taplo/core-0.1.1" = { name = "_at_taplo_slash_core"; packageName = "@taplo/core"; @@ -10975,15 +10705,6 @@ let sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="; }; }; - "@trivago/prettier-plugin-sort-imports-4.2.1" = { - name = "_at_trivago_slash_prettier-plugin-sort-imports"; - packageName = "@trivago/prettier-plugin-sort-imports"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.1.tgz"; - sha512 = "iuy2MPVURGdxILTchHr15VAioItuYBejKfcTmQFlxIuqA7jeaT6ngr5aUIG6S6U096d6a6lJCgaOwlRrPLlOPg=="; - }; - }; "@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" = { name = "_at_trufflesuite_slash_uws-js-unofficial"; packageName = "@trufflesuite/uws-js-unofficial"; @@ -11470,6 +11191,15 @@ let sha512 = "McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw=="; }; }; + "@types/hast-3.0.4" = { + name = "_at_types_slash_hast"; + packageName = "@types/hast"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz"; + sha512 = "WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ=="; + }; + }; "@types/html-minifier-terser-6.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; @@ -11596,15 +11326,6 @@ let sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; "@types/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; @@ -11623,13 +11344,13 @@ let sha512 = "sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q=="; }; }; - "@types/lodash-4.17.4" = { + "@types/lodash-4.17.5" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz"; - sha512 = "wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz"; + sha512 = "MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw=="; }; }; "@types/long-4.0.2" = { @@ -11839,22 +11560,13 @@ let sha512 = "eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g=="; }; }; - "@types/node-20.14.1" = { + "@types/node-20.14.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.14.1"; + version = "20.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz"; - sha512 = "T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA=="; - }; - }; - "@types/node-20.5.9" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "20.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz"; - sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz"; + sha512 = "xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q=="; }; }; "@types/node-6.14.13" = { @@ -11947,15 +11659,6 @@ let sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.2.79" = { - name = "_at_types_slash_react"; - packageName = "@types/react"; - version = "18.2.79"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz"; - sha512 = "RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w=="; - }; - }; "@types/react-18.3.3" = { name = "_at_types_slash_react"; packageName = "@types/react"; @@ -11965,15 +11668,6 @@ let sha512 = "hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw=="; }; }; - "@types/react-dom-18.2.25" = { - name = "_at_types_slash_react-dom"; - packageName = "@types/react-dom"; - version = "18.2.25"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz"; - sha512 = "o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA=="; - }; - }; "@types/responselike-1.0.3" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; @@ -12235,15 +11929,6 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-6.0.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; - sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; - }; - }; "@typescript-eslint/eslint-plugin-6.21.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; @@ -12253,15 +11938,6 @@ let sha512 = "oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA=="; }; }; - "@typescript-eslint/parser-6.0.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.0.0.tgz"; - sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; - }; - }; "@typescript-eslint/parser-6.21.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; @@ -12271,15 +11947,6 @@ let sha512 = "tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ=="; }; }; - "@typescript-eslint/scope-manager-6.0.0" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.0.0.tgz"; - sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; - }; - }; "@typescript-eslint/scope-manager-6.21.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; @@ -12289,15 +11956,6 @@ let sha512 = "OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg=="; }; }; - "@typescript-eslint/type-utils-6.0.0" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.0.0.tgz"; - sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; - }; - }; "@typescript-eslint/type-utils-6.21.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; @@ -12307,15 +11965,6 @@ let sha512 = "rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag=="; }; }; - "@typescript-eslint/types-6.0.0" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.0.0.tgz"; - sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; - }; - }; "@typescript-eslint/types-6.21.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; @@ -12325,15 +11974,6 @@ let sha512 = "1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg=="; }; }; - "@typescript-eslint/typescript-estree-6.0.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.0.0.tgz"; - sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; - }; - }; "@typescript-eslint/typescript-estree-6.21.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; @@ -12343,15 +11983,6 @@ let sha512 = "6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ=="; }; }; - "@typescript-eslint/utils-6.0.0" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.0.0.tgz"; - sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; - }; - }; "@typescript-eslint/utils-6.21.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; @@ -12361,15 +11992,6 @@ let sha512 = "NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ=="; }; }; - "@typescript-eslint/visitor-keys-6.0.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.0.0.tgz"; - sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; - }; - }; "@typescript-eslint/visitor-keys-6.21.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; @@ -12424,13 +12046,13 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-8.2.1" = { + "@vercel/build-utils-8.2.2" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.2.1.tgz"; - sha512 = "hZiSnzgb13JlWh4spHq5g6RQ76xMNFBFQLWmW7xx+f0yMsWTx/h6uBJm8AbW7AhAtsqeJ8Q6KvCFnxwXKYxLDw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.2.2.tgz"; + sha512 = "+Nf/Yk3GeMI47L/g5KYEvsj7yqVkhb6vZqjxavUBRVPSsgJ7fuNVfYvvpFj/Y0BYysEF8XNUxKFuwGROiop/ow=="; }; }; "@vercel/error-utils-2.0.2" = { @@ -12460,13 +12082,13 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.32" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.33" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.32"; + version = "2.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.32.tgz"; - sha512 = "QmwF6cnGxREBLQtRSQOYgZqH8H8MAlHEWABXiiZcz5Ma9VH6jteIXdZQI2d9nvaqPMcxmmpSmhCT5QAK2SMO5g=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.33.tgz"; + sha512 = "fJFRZaQfaaNdun8u/QepzKVrGnTW/9pXls322la5pP5xHAbaWPTTNoFtG/odZUXiv0oNV1qVWnTI4bnqFh6Icw=="; }; }; "@vercel/go-3.1.1" = { @@ -12487,31 +12109,31 @@ let sha512 = "/Q2MKk1GfOuZAnkE9jQexjtUQqanbY65R+xtJWd9yKIgwcfRI1hxiNH3uXyVM5AvLoY+fxxULkSuxDtUKpkJpQ=="; }; }; - "@vercel/next-4.2.14" = { + "@vercel/next-4.2.17" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.2.14"; + version = "4.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.2.14.tgz"; - sha512 = "CBeaXIGS7mOgFSH429HRjIOxJBbtiQW6gf1mz/rIQoNcZjSxhfe+nMAxfkDlXAzCsGQVFbzVR9omnijTFbC79w=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.2.17.tgz"; + sha512 = "b1ZwH/3sL4+CrrIjncZLAqjd+ts0KyVGL0HEOWU340OI3hXmQQAN+2k0MWlqm8Vu8rFGfk9VEQ9yJG/pmPx6mg=="; }; }; - "@vercel/nft-0.27.0" = { + "@vercel/nft-0.27.2" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.27.0"; + version = "0.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.0.tgz"; - sha512 = "W5pValyhToK9hbgEUAM6sLRUIl1I++RsFnXKHXtND50P1+vZ+OYPCzq1OOz0Ok6ghK6aOwae8G/rEAXkLedC+w=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.2.tgz"; + sha512 = "7LeioS1yE5hwPpQfD3DdH04tuugKjo5KrJk3yK5kAI3Lh76iSsK/ezoFQfzuT08X3ZASQOd1y9ePjLNI9+TxTQ=="; }; }; - "@vercel/node-3.1.6" = { + "@vercel/node-3.1.7" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.1.6.tgz"; - sha512 = "PXCbN8Ocw5xdCidi8XKbBbKAoyBh2XJQJJFvImzAHM1pck7gCLYxgb7ZBcrJ/BtgMjmy/kSmSQ8FF/ctsFRK7w=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.1.7.tgz"; + sha512 = "EYSHEt0Up70cOlawkSzb5CFHyHoOMuJG9Q/hWU+4zIpnXefZSanR/oaZMd+UFoaAKDVryBz35FVV7gNo6HxX9A=="; }; }; "@vercel/python-4.3.0" = { @@ -12523,22 +12145,22 @@ let sha512 = "tj6ffEh+ligmQoo/ONOg7DNX0VGKJt9FyswyOIIp6lZufs5oGzHAfan4+5QzF/2INxvXobN0aMYgcbFHJ81ZKg=="; }; }; - "@vercel/redwood-2.0.9" = { + "@vercel/redwood-2.0.10" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.9.tgz"; - sha512 = "zv0uJa+XtCJ15TdfCI5ybZM1hS3OBl28idCfN3vtWR+g5HjDSW8acYOzRw2Xy7wM1f+Fje1/Nx2AdYjCM4TWTA=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.10.tgz"; + sha512 = "vZmjOtiUQOdQHVIRrlPY/pSVuwn5GSuq5ihg530Rq51pYIHf0PSP/BnF6zventlG0bKe53MarxE+mmBUb0LDxw=="; }; }; - "@vercel/remix-builder-2.1.6" = { + "@vercel/remix-builder-2.1.7" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.1.6.tgz"; - sha512 = "n2gnNW9HTWlTuEwTbtVI9GRHoQi/2kPu44l0zvFDw8GlsswW0/qJPvr8SFG83FDylQcafvW8LUWO9oXefuVrFA=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.1.7.tgz"; + sha512 = "OGd7aod8wz3uMabGGzmDtNQaSz5+8ZJOmUzhMPxqHwmkTOYntIEPCXhAsi26kf+IuDP7Zj2Md7gUAJGsq5QNSg=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -12559,13 +12181,13 @@ let sha512 = "UZYwlSEEfVnfzTmgkD+kxex9/gkZGt7unOWNyWFN7V/ZnZSsGBUgv6hXLnwejdRi3EztgRQEBd1kUKlXdIeC0Q=="; }; }; - "@vercel/static-build-2.5.10" = { + "@vercel/static-build-2.5.11" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.5.10"; + version = "2.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.10.tgz"; - sha512 = "ixu9pjzNfplhidzCYioeATe24ubQM1+FZS4rvkGFTA/g+p66ZpZBIzqgpPe8wsVrEHNDXPAHG13CjEOyka1dBQ=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.11.tgz"; + sha512 = "CUZInKro8CqNH4ZyNccRSfy8cF4KBklIiGOwWVjjjVQLtIGdC55iVADIHAsCmA5yEJVsjenIi+943/JcR0bw2Q=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12577,87 +12199,6 @@ let sha512 = "2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw=="; }; }; - "@vitejs/plugin-react-4.0.4" = { - name = "_at_vitejs_slash_plugin-react"; - packageName = "@vitejs/plugin-react"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz"; - sha512 = "7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g=="; - }; - }; - "@volar-plugins/css-2.0.0" = { - name = "_at_volar-plugins_slash_css"; - packageName = "@volar-plugins/css"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/css/-/css-2.0.0.tgz"; - sha512 = "ZAXdRK6n6T5fwC3Et4rOofLS9VH919/ayFHo5tXNCA7k2wkrVU2Uno408+024/irpVsFCkSxipycSQJBtTFh+A=="; - }; - }; - "@volar-plugins/emmet-2.0.0" = { - name = "_at_volar-plugins_slash_emmet"; - packageName = "@volar-plugins/emmet"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/emmet/-/emmet-2.0.0.tgz"; - sha512 = "fbi+fDjixvipXt6qX71Bci66RGho/LnxeA9GfGsezdDWdQr9VjHs/3ewEpgi3fJkPeZqSawAkG+v2YQEWG4QMg=="; - }; - }; - "@volar-plugins/html-2.0.0" = { - name = "_at_volar-plugins_slash_html"; - packageName = "@volar-plugins/html"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/html/-/html-2.0.0.tgz"; - sha512 = "X/DlOX/qJ54v8NzS80ZuD0OOU+Txx4GH0cUffhIsd9yn55mP/vc4nH+Lxo0Yz2I8SkjIiLM+DssumvAJSjH+og=="; - }; - }; - "@volar-plugins/json-2.0.0" = { - name = "_at_volar-plugins_slash_json"; - packageName = "@volar-plugins/json"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/json/-/json-2.0.0.tgz"; - sha512 = "o56Ei2D2jVs5opSILGcE3wHVg0dGZEQ9A6xsx+klCDJ2/ZNADrByefga0z8LKdD2ZZiIpUpjzvsM/Oh9+hZOWw=="; - }; - }; - "@volar-plugins/pug-2.0.0" = { - name = "_at_volar-plugins_slash_pug"; - packageName = "@volar-plugins/pug"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/pug/-/pug-2.0.0.tgz"; - sha512 = "BDz1n7EUa+J51cBxdhj8jVfB6KywB0BHt6IaMu/HV8VXFLNpDQCCUMEkEb5Wm7u9iV54hYk1x4cZawGruhHGZw=="; - }; - }; - "@volar-plugins/pug-beautify-2.0.0" = { - name = "_at_volar-plugins_slash_pug-beautify"; - packageName = "@volar-plugins/pug-beautify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/pug-beautify/-/pug-beautify-2.0.0.tgz"; - sha512 = "25r8HwObez/LoNrb0+kbyKDbhlEJe/WgjYeYMJ/OlKu+60BvSWyDTDtGmkV9DHh921zeAHcFTkHebf7oX1KbmA=="; - }; - }; - "@volar-plugins/typescript-2.0.0" = { - name = "_at_volar-plugins_slash_typescript"; - packageName = "@volar-plugins/typescript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/typescript/-/typescript-2.0.0.tgz"; - sha512 = "392e4KyMikiU9QkC/ii1K/HCs5Zcf8h6GA9BTpuuhxXeYk8LOnqDX8xLHTFVBuTORCXzrikZEzNzXHdL/4tqEA=="; - }; - }; - "@volar-plugins/typescript-twoslash-queries-2.0.0" = { - name = "_at_volar-plugins_slash_typescript-twoslash-queries"; - packageName = "@volar-plugins/typescript-twoslash-queries"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar-plugins/typescript-twoslash-queries/-/typescript-twoslash-queries-2.0.0.tgz"; - sha512 = "NwqBBruD1DvVmFVyPinOuuMGqpSroVTnl1R1vOnhbKquButOj+0b2k43Gn1fz/Uqe9hijLCxMEtMIIcW38ny8w=="; - }; - }; "@volar/kit-2.2.5" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; @@ -12667,15 +12208,6 @@ let sha512 = "Bmn0UCaT43xUGGRwcmFG9lKhiCCLjRT4ScSLLPn5C9ltUcSGnIFFDlbZZa1PreHYHq25/4zkXt9Ap32klAh17w=="; }; }; - "@volar/language-core-1.4.1" = { - name = "_at_volar_slash_language-core"; - packageName = "@volar/language-core"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.4.1.tgz"; - sha512 = "EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ=="; - }; - }; "@volar/language-core-2.2.5" = { name = "_at_volar_slash_language-core"; packageName = "@volar/language-core"; @@ -12685,15 +12217,6 @@ let sha512 = "2htyAuxRrAgETmFeUhT4XLELk3LiEcqoW/B8YUXMF6BrGWLMwIR09MFaZYvrA2UhbdAeSyeQ726HaWSWkexUcQ=="; }; }; - "@volar/language-server-1.4.1" = { - name = "_at_volar_slash_language-server"; - packageName = "@volar/language-server"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.4.1.tgz"; - sha512 = "UxhiN205o8ZfTnMNhRPCtW+ncrBtqZMd+f08Xf99Je4WB+SYyv3VNnIZEQDXfaTXR6mLUgQ1mDwPsUOLKKGY8A=="; - }; - }; "@volar/language-server-2.2.5" = { name = "_at_volar_slash_language-server"; packageName = "@volar/language-server"; @@ -12703,15 +12226,6 @@ let sha512 = "PV/jkUkI+m72HTXwnY7hsGqLY3VNi96ZRoWFRzVC9QG/853bixxjveXPJIiydMJ9I739lO3kcj3hnGrF5Sm+HA=="; }; }; - "@volar/language-service-1.4.1" = { - name = "_at_volar_slash_language-service"; - packageName = "@volar/language-service"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.4.1.tgz"; - sha512 = "F30uT+xk20ZYpxRwNW9xBEoErSqd9zNW7iuFwSIX9bYO/12RLjB2I+vgM/GdPZnzZ37imXa76ykwqTRXrafigQ=="; - }; - }; "@volar/language-service-2.2.5" = { name = "_at_volar_slash_language-service"; packageName = "@volar/language-service"; @@ -12730,15 +12244,6 @@ let sha512 = "MTOvWVKxM7ugKO3Amffkv2pND03fe2JtfygYaputqjVFML7YxtTXj8SPnI2pODLeSwOKzDYL6Q8r5j6Y5AgUzQ=="; }; }; - "@volar/source-map-1.4.1" = { - name = "_at_volar_slash_source-map"; - packageName = "@volar/source-map"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.4.1.tgz"; - sha512 = "bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA=="; - }; - }; "@volar/source-map-2.2.5" = { name = "_at_volar_slash_source-map"; packageName = "@volar/source-map"; @@ -12757,24 +12262,6 @@ let sha512 = "eSV/n75+ppfEVugMC/salZsI44nXDPAyL6+iTYCNLtiLHGJsnMv9GwiDMujrvAUj/aLQyqRJgYtXRoxop2clCw=="; }; }; - "@volar/vue-language-core-1.6.5" = { - name = "_at_volar_slash_vue-language-core"; - packageName = "@volar/vue-language-core"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/vue-language-core/-/vue-language-core-1.6.5.tgz"; - sha512 = "IF2b6hW4QAxfsLd5mePmLgtkXzNi+YnH6ltCd80gb7+cbdpFMjM1I+w+nSg2kfBTyfu+W8useCZvW89kPTBpzg=="; - }; - }; - "@volar/vue-language-service-1.6.5" = { - name = "_at_volar_slash_vue-language-service"; - packageName = "@volar/vue-language-service"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/vue-language-service/-/vue-language-service-1.6.5.tgz"; - sha512 = "2uZPvDfo8Bspq9u+RaQhsdONFhu35HBS7/ZDXhhmhyMfcN327e1vnvAhHPDfOb8XNFg/Cj54rVKegANpKZJTOg=="; - }; - }; "@vscode/emmet-helper-2.9.3" = { name = "_at_vscode_slash_emmet-helper"; packageName = "@vscode/emmet-helper"; @@ -12784,15 +12271,6 @@ let sha512 = "rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw=="; }; }; - "@vscode/l10n-0.0.11" = { - name = "_at_vscode_slash_l10n"; - packageName = "@vscode/l10n"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz"; - sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; - }; - }; "@vscode/l10n-0.0.16" = { name = "_at_vscode_slash_l10n"; packageName = "@vscode/l10n"; @@ -12820,13 +12298,103 @@ let sha512 = "yojuDFEjohx6Jb+x949JRNtSn6Wk2FAh4MldLE3ck9cfvCqzwxF32QsNy1T9Oe4oT+ZfFcg0uPUCajJzOmPlTA=="; }; }; - "@vscode/vsce-2.26.1" = { + "@vscode/vsce-2.27.0" = { name = "_at_vscode_slash_vsce"; packageName = "@vscode/vsce"; - version = "2.26.1"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.26.1.tgz"; - sha512 = "QOG6Ht7V93nhwcBxPWcG33UK0qDGEoJdg0xtVeaTN27W6PGdMJUJGTPhB/sNHUIFKwvwzv/zMAHvDgMNXbcwlA=="; + url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz"; + sha512 = "FFUMBVSyyjjJpWszwqk7d4U3YllY8FdWslbUDMRki1x4ZjA3Z0hmRMfypWrjP9sptbSR9nyPFU4uqjhy2qRB/w=="; + }; + }; + "@vscode/vsce-sign-2.0.4" = { + name = "_at_vscode_slash_vsce-sign"; + packageName = "@vscode/vsce-sign"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.4.tgz"; + sha512 = "0uL32egStKYfy60IqnynAChMTbL0oqpqk0Ew0YHiIb+fayuGZWADuIPHWUcY1GCnAA+VgchOPDMxnc2R3XGWEA=="; + }; + }; + "@vscode/vsce-sign-alpine-arm64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-alpine-arm64"; + packageName = "@vscode/vsce-sign-alpine-arm64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.2.tgz"; + sha512 = "E80YvqhtZCLUv3YAf9+tIbbqoinWLCO/B3j03yQPbjT3ZIHCliKZlsy1peNc4XNZ5uIb87Jn0HWx/ZbPXviuAQ=="; + }; + }; + "@vscode/vsce-sign-alpine-x64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-alpine-x64"; + packageName = "@vscode/vsce-sign-alpine-x64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.2.tgz"; + sha512 = "n1WC15MSMvTaeJ5KjWCzo0nzjydwxLyoHiMJHu1Ov0VWTZiddasmOQHekA47tFRycnt4FsQrlkSCTdgHppn6bw=="; + }; + }; + "@vscode/vsce-sign-darwin-arm64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-darwin-arm64"; + packageName = "@vscode/vsce-sign-darwin-arm64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.2.tgz"; + sha512 = "rz8F4pMcxPj8fjKAJIfkUT8ycG9CjIp888VY/6pq6cuI2qEzQ0+b5p3xb74CJnBbSC0p2eRVoe+WgNCAxCLtzQ=="; + }; + }; + "@vscode/vsce-sign-darwin-x64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-darwin-x64"; + packageName = "@vscode/vsce-sign-darwin-x64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.2.tgz"; + sha512 = "MCjPrQ5MY/QVoZ6n0D92jcRb7eYvxAujG/AH2yM6lI0BspvJQxp0o9s5oiAM9r32r9tkLpiy5s2icsbwefAQIw=="; + }; + }; + "@vscode/vsce-sign-linux-arm-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-linux-arm"; + packageName = "@vscode/vsce-sign-linux-arm"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.2.tgz"; + sha512 = "Fkb5jpbfhZKVw3xwR6t7WYfwKZktVGNXdg1m08uEx1anO0oUPUkoQRsNm4QniL3hmfw0ijg00YA6TrxCRkPVOQ=="; + }; + }; + "@vscode/vsce-sign-linux-arm64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-linux-arm64"; + packageName = "@vscode/vsce-sign-linux-arm64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.2.tgz"; + sha512 = "Ybeu7cA6+/koxszsORXX0OJk9N0GgfHq70Wqi4vv2iJCZvBrOWwcIrxKjvFtwyDgdeQzgPheH5nhLVl5eQy7WA=="; + }; + }; + "@vscode/vsce-sign-linux-x64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-linux-x64"; + packageName = "@vscode/vsce-sign-linux-x64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.2.tgz"; + sha512 = "NsPPFVtLaTlVJKOiTnO8Cl78LZNWy0Q8iAg+LlBiCDEgC12Gt4WXOSs2pmcIjDYzj2kY4NwdeN1mBTaujYZaPg=="; + }; + }; + "@vscode/vsce-sign-win32-arm64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-win32-arm64"; + packageName = "@vscode/vsce-sign-win32-arm64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.2.tgz"; + sha512 = "wPs848ymZ3Ny+Y1Qlyi7mcT6VSigG89FWQnp2qRYCyMhdJxOpA4lDwxzlpL8fG6xC8GjQjGDkwbkWUcCobvksQ=="; + }; + }; + "@vscode/vsce-sign-win32-x64-2.0.2" = { + name = "_at_vscode_slash_vsce-sign-win32-x64"; + packageName = "@vscode/vsce-sign-win32-x64"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.2.tgz"; + sha512 = "pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg=="; }; }; "@vue/cli-shared-utils-5.0.8" = { @@ -12865,22 +12433,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.4.27" = { + "@vue/compiler-core-3.4.29" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.4.27"; + version = "3.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz"; - sha512 = "E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz"; + sha512 = "TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg=="; }; }; - "@vue/compiler-dom-3.4.27" = { + "@vue/compiler-dom-3.4.29" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.4.27"; + version = "3.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz"; - sha512 = "kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz"; + sha512 = "A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w=="; }; }; "@vue/compiler-sfc-2.7.16" = { @@ -12892,40 +12460,31 @@ let sha512 = "KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg=="; }; }; - "@vue/compiler-sfc-3.4.27" = { + "@vue/compiler-sfc-3.4.29" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.4.27"; + version = "3.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz"; - sha512 = "nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.29.tgz"; + sha512 = "zygDcEtn8ZimDlrEQyLUovoWgKQic6aEQqRXce2WXBvSeHbEbcAsXyCk9oG33ZkyWH4sl9D3tkYc1idoOkdqZQ=="; }; }; - "@vue/compiler-ssr-3.4.27" = { + "@vue/compiler-ssr-3.4.29" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.4.27"; + version = "3.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz"; - sha512 = "CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.29.tgz"; + sha512 = "rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ=="; }; }; - "@vue/reactivity-3.4.27" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.4.27"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz"; - sha512 = "kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA=="; - }; - }; - "@vue/shared-3.4.27" = { + "@vue/shared-3.4.29" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.4.27"; + version = "3.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz"; - sha512 = "DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz"; + sha512 = "hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -13945,13 +13504,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.11.3" = { + "acorn-8.12.0" = { name = "acorn"; packageName = "acorn"; - version = "8.11.3"; + version = "8.12.0"; 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.0.tgz"; + sha512 = "RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw=="; }; }; "acorn-8.8.2" = { @@ -14071,13 +13630,13 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; - "acorn-walk-8.3.2" = { + "acorn-walk-8.3.3" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "8.3.2"; + version = "8.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz"; - sha512 = "cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz"; + sha512 = "MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw=="; }; }; "add-stream-1.0.0" = { @@ -14260,13 +13819,13 @@ let sha512 = "PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA=="; }; }; - "ajv-8.15.0" = { + "ajv-8.16.0" = { name = "ajv"; packageName = "ajv"; - version = "8.15.0"; + version = "8.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.15.0.tgz"; - sha512 = "15BTtQUOsSrmHCy+B4VnAiJAJxJ8IFgu6fcjFQF3jQYZ78nLSQthlFg4ehp+NLIyfvFgOlxNsjKIEhydtFPVHQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz"; + sha512 = "F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw=="; }; }; "ajv-8.6.3" = { @@ -14773,15 +14332,6 @@ let sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="; }; }; - "append-transform-2.0.0" = { - name = "append-transform"; - packageName = "append-transform"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz"; - sha512 = "7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg=="; - }; - }; "append-type-1.0.2" = { name = "append-type"; packageName = "append-type"; @@ -14899,15 +14449,6 @@ let sha512 = "KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw=="; }; }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha512 = "Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw=="; - }; - }; "are-we-there-yet-1.1.7" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -15142,15 +14683,6 @@ let sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; }; }; - "array-includes-3.1.8" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz"; - sha512 = "itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ=="; - }; - }; "array-iterate-1.1.4" = { name = "array-iterate"; packageName = "array-iterate"; @@ -15250,33 +14782,6 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.findlastindex-1.2.5" = { - name = "array.prototype.findlastindex"; - packageName = "array.prototype.findlastindex"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz"; - sha512 = "zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ=="; - }; - }; - "array.prototype.flat-1.3.2" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz"; - sha512 = "djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA=="; - }; - }; - "array.prototype.flatmap-1.3.2" = { - name = "array.prototype.flatmap"; - packageName = "array.prototype.flatmap"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz"; - sha512 = "Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ=="; - }; - }; "array.prototype.reduce-1.0.7" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; @@ -15286,15 +14791,6 @@ let sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q=="; }; }; - "array.prototype.tosorted-1.1.4" = { - name = "array.prototype.tosorted"; - packageName = "array.prototype.tosorted"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz"; - sha512 = "p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA=="; - }; - }; "arraybuffer.prototype.slice-1.0.3" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; @@ -15817,15 +15313,6 @@ let sha512 = "ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="; }; }; - "autoprefixer-10.4.19" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz"; - sha512 = "BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew=="; - }; - }; "autoprefixer-9.8.8" = { name = "autoprefixer"; packageName = "autoprefixer"; @@ -15853,13 +15340,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.21.2" = { + "aws-crt-1.21.3" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.21.2.tgz"; - sha512 = "/jq5yJwdethIaC+HyqCrgW2ZqxjUURBo/6CIfnD0HbpIE+vLIPQxENW/pp3Atu20Hm2WkjM9diJD4zJycK+olA=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.21.3.tgz"; + sha512 = "oaiP5zoPkXwbM9T3nwSgq6CBZWx0501iefLPg12FODniIgqGMyzbMXHYC+fxbCoP5SOQVmCwtAfbNuIG5bFENg=="; }; }; "aws-sdk-2.1340.0" = { @@ -15943,15 +15430,6 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.4.0" = { - name = "axios"; - packageName = "axios"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz"; - sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; - }; - }; "axios-1.7.2" = { name = "axios"; packageName = "axios"; @@ -16177,13 +15655,13 @@ let sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; }; }; - "bare-events-2.3.1" = { + "bare-events-2.4.2" = { name = "bare-events"; packageName = "bare-events"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/bare-events/-/bare-events-2.3.1.tgz"; - sha512 = "sJnSOTVESURZ61XgEleqmP255T6zTYwHPwE4r6SssIh0U9/uDvfpdoJYpVUerJJZH2fueO+CdT8ZT+OC/7aZDA=="; + url = "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz"; + sha512 = "qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q=="; }; }; "base-0.11.2" = { @@ -16294,13 +15772,13 @@ let sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; }; }; - "bash-language-server-5.3.4" = { + "bash-language-server-5.4.0" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "5.3.4"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.3.4.tgz"; - sha512 = "9GEzJVOOyU7ZQbDI/uFc8N9FGuun6UZv1qB9bNUbehIb1gA4pOpkIYtqtfSq0XQSO25hMp8d/tzsmFJmeX+dQg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.4.0.tgz"; + sha512 = "YLCIBjnwdxvlwlurTA4Be7UfPXDzaWCJKzJwzO8rVjJH0QlbhPvo3FXkYOBXPLg81G4hb0ZbhSAi4+yrs7j5cQ=="; }; }; "basic-auth-2.0.1" = { @@ -17239,13 +16717,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.23.0" = { + "browserslist-4.23.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.23.0"; + version = "4.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz"; - sha512 = "QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz"; + sha512 = "TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw=="; }; }; "brq-0.1.10" = { @@ -17392,6 +16870,15 @@ 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"; @@ -17806,15 +17293,6 @@ let sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; }; - "caching-transform-4.0.0" = { - name = "caching-transform"; - packageName = "caching-transform"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz"; - sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA=="; - }; - }; "call-bind-1.0.7" = { name = "call-bind"; packageName = "call-bind"; @@ -18040,13 +17518,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001627" = { + "caniuse-lite-1.0.30001634" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001627"; + version = "1.0.30001634"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001627.tgz"; - sha512 = "4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz"; + sha512 = "fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA=="; }; }; "canvas-2.11.2" = { @@ -18139,13 +17617,13 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.68.75" = { + "cdk8s-2.68.79" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.68.75"; + version = "2.68.79"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.75.tgz"; - sha512 = "NydUyULiSsu1l86AcYZHBETTIoAa3Dr+iqT76D0CNicwo6nAaGC4xnCbGU0sGZ5Q6pRRMnaGGbMmE/45X+ie2Q=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.79.tgz"; + sha512 = "aXYFGZU6FflDDz/Ywu2PJ/FHN2mLQbdbQjmzHjKypOk8P99iUcDq3rfWAUxAQGeErQlbyPCilKFfVEa1qqrRwg=="; }; }; "cdk8s-plus-25-2.22.79" = { @@ -18229,15 +17707,6 @@ let sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; - "chalk-4.1.1" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; - }; - }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -18580,13 +18049,13 @@ let sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; - "chromium-bidi-0.5.19" = { + "chromium-bidi-0.5.23" = { name = "chromium-bidi"; packageName = "chromium-bidi"; - version = "0.5.19"; + version = "0.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.19.tgz"; - sha512 = "UA6zL77b7RYCjJkZBsZ0wlvCTD+jTjllZ8f6wdO4buevXgTZYjV+XLB9CiEa2OuuTGGTLnI7eN9I60YxuALGQg=="; + url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.23.tgz"; + sha512 = "1o/gLU9wDqbN5nL2MtfjykjOuighGXc3/hnWueO1haiEoFgX8h5vbvcA4tgdQfjw1mkZ1OEF4x/+HVeqEX6NoA=="; }; }; "chunk-store-iterator-1.0.3" = { @@ -18715,15 +18184,6 @@ let sha512 = "D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg=="; }; }; - "clean-regexp-1.0.0" = { - name = "clean-regexp"; - packageName = "clean-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz"; - sha512 = "GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw=="; - }; - }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -18976,15 +18436,6 @@ let sha512 = "ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ=="; }; }; - "client-only-0.0.1" = { - name = "client-only"; - packageName = "client-only"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"; - sha512 = "IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="; - }; - }; "cliff-0.1.10" = { name = "cliff"; packageName = "cliff"; @@ -19318,24 +18769,6 @@ let sha512 = "xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA=="; }; }; - "code-inspector-core-0.1.9" = { - name = "code-inspector-core"; - packageName = "code-inspector-core"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/code-inspector-core/-/code-inspector-core-0.1.9.tgz"; - sha512 = "A00SydCM8zgPWfoM140hbcOjTFzciuGKYMsd7sl1evy+M+ZH2/k6n90vGHHTCdOfVmlaaHcXU+aaPnsADb17Aw=="; - }; - }; - "code-inspector-plugin-0.1.9" = { - name = "code-inspector-plugin"; - packageName = "code-inspector-plugin"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/code-inspector-plugin/-/code-inspector-plugin-0.1.9.tgz"; - sha512 = "/OyEt9e+DmxuyHI3dMzkOgcbFT6CIi8PgwK7QIlIQKMU/P9QvDehHUKpZU1Yjd/AAymcni7RikRVQNGU3+kwtg=="; - }; - }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -19354,6 +18787,15 @@ let sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw=="; }; }; + "codemaker-1.100.0" = { + name = "codemaker"; + packageName = "codemaker"; + version = "1.100.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.100.0.tgz"; + sha512 = "EVKV5v2HZf/a2nuRZJ3pMo1BImN6MX/9O22Yo1gQn+DeFbU2TqKnpCu16pTOVg4b4CakbFckeimVzQIqmFGquQ=="; + }; + }; "codemaker-1.95.0" = { name = "codemaker"; packageName = "codemaker"; @@ -19363,15 +18805,6 @@ let sha512 = "q/U2NeZSaKnVMarOi+BR8MbaHEFKVmBefTSSXj/0W4OBarw/uUT2qCPojYF16gJtfFz7qCkJeuP+zYDq+xNEpg=="; }; }; - "codemaker-1.99.0" = { - name = "codemaker"; - packageName = "codemaker"; - version = "1.99.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.99.0.tgz"; - sha512 = "Skhc0pdsxRWxevjQWLFWOGzhC8BJaac0MfV0lF5UUJuRcf2T6qAhc1OGuWwlZTZZxor9dS0JKavlSTKyLcksag=="; - }; - }; "coffeescript-2.7.0" = { name = "coffeescript"; packageName = "coffeescript"; @@ -19381,6 +18814,15 @@ let sha512 = "hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A=="; }; }; + "collapse-white-space-2.1.0" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz"; + sha512 = "loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw=="; + }; + }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -20128,6 +19570,15 @@ let sha512 = "UaqO1EirWjON2ENsyau7N5lbkrdYBpS6mYlXSeff/OYXsd6EGZ+SXSmNPoljL2PSua8fgjAEaldSA73PMZQ9Eg=="; }; }; + "consola-3.2.3" = { + name = "consola"; + packageName = "consola"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz"; + sha512 = "I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ=="; + }; + }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -20507,15 +19958,6 @@ let sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="; }; }; - "convert-source-map-1.9.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - }; "convert-source-map-2.0.0" = { name = "convert-source-map"; packageName = "convert-source-map"; @@ -21398,13 +20840,13 @@ let sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; }; }; - "cssnano-7.0.1" = { + "cssnano-7.0.2" = { name = "cssnano"; packageName = "cssnano"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.1.tgz"; - sha512 = "917Mej/4SdI7b55atsli3sU4MOJ9XDoKgnlCtQtXYj8XUFcM3riTuYHyqBBnnskawW+zWwp0KxJzpEUodlpqUg=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.2.tgz"; + sha512 = "LXm/Xx6TNLzfHM2lBaIQHfvtdW5QfdbyLzfJAWZrclCAb47yVa0/yJG69+amcw3Lq0YZ+kyU40rbsMPLcMt9aw=="; }; }; "cssnano-preset-default-5.2.14" = { @@ -21416,13 +20858,13 @@ let sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; }; }; - "cssnano-preset-default-7.0.1" = { + "cssnano-preset-default-7.0.2" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.1.tgz"; - sha512 = "Fumyr+uZMcjYQeuHssAZxn0cKj3cdQc5GcxkBcmEzISGB+UW9CLNlU4tBOJbJGcPukFDlicG32eFbrc8K9V5pw=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.2.tgz"; + sha512 = "z95kGKZx8VWHfERj7LFzuiTxylbvEp07ZEYaFu+t6bFyNOXLd/+3oPyNaY7ISwcrfHFCkt8OfRo4IZxVRJZ7dg=="; }; }; "cssnano-utils-3.1.0" = { @@ -22271,15 +21713,6 @@ let sha512 = "okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="; }; }; - "de-indent-1.0.2" = { - name = "de-indent"; - packageName = "de-indent"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; - sha512 = "e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="; - }; - }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -22703,15 +22136,6 @@ let sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; }; }; - "default-require-extensions-3.0.1" = { - name = "default-require-extensions"; - packageName = "default-require-extensions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz"; - sha512 = "eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw=="; - }; - }; "defaults-1.0.4" = { name = "defaults"; packageName = "defaults"; @@ -22811,6 +22235,15 @@ let sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="; }; }; + "defu-6.1.4" = { + name = "defu"; + packageName = "defu"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz"; + sha512 = "mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="; + }; + }; "degenerator-5.0.1" = { name = "degenerator"; packageName = "degenerator"; @@ -23099,13 +22532,13 @@ let sha512 = "RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="; }; }; - "devtools-protocol-0.0.1286932" = { + "devtools-protocol-0.0.1299070" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1286932"; + version = "0.0.1299070"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1286932.tgz"; - sha512 = "wu58HMQll9voDjR4NlPyoDEw1syfzaBNHymMMZ/QOXiHRNluOnDgu9hp1yHOKYoMlxCh4lSSiugLITe6Fvu1eA=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1299070.tgz"; + sha512 = "+qtL3eX50qsJ7c+qVyagqi7AWMoQCBGNfoyJZMwm/NSXVqLYbuitrWEEIzxfUmTNy7//Xe8yhMmQ+elj3uAqSg=="; }; }; "dezalgo-1.0.4" = { @@ -24035,6 +23468,15 @@ let sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q=="; }; }; + "editorconfig-2.0.0" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-2.0.0.tgz"; + sha512 = "s1NQ63WQ7RNXH6Efb2cwuyRlfpbtdZubvfNe4vCuoyGPewNPY7vah8JUSOFBiJ+jr99Qh8t0xKv0oITc1dclgw=="; + }; + }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -24053,13 +23495,13 @@ let sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="; }; }; - "electron-to-chromium-1.4.789" = { + "electron-to-chromium-1.4.802" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.789"; + version = "1.4.802"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz"; - sha512 = "0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz"; + sha512 = "TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA=="; }; }; "elegant-spinner-1.0.1" = { @@ -24396,13 +23838,13 @@ let sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q=="; }; }; - "enhanced-resolve-5.16.1" = { + "enhanced-resolve-5.17.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.16.1"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz"; - sha512 = "4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz"; + sha512 = "dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA=="; }; }; "enquirer-2.3.6" = { @@ -24684,15 +24126,6 @@ let sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; - "es-iterator-helpers-1.0.19" = { - name = "es-iterator-helpers"; - packageName = "es-iterator-helpers"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz"; - sha512 = "zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw=="; - }; - }; "es-module-lexer-1.4.1" = { name = "es-module-lexer"; packageName = "es-module-lexer"; @@ -24729,15 +24162,6 @@ let sha512 = "3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ=="; }; }; - "es-shim-unscopables-1.0.2" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz"; - sha512 = "J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw=="; - }; - }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -24882,15 +24306,6 @@ let sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; }; }; - "esbuild-0.18.20" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; - sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; - }; - }; "esbuild-0.19.12" = { name = "esbuild"; packageName = "esbuild"; @@ -24909,13 +24324,13 @@ let sha512 = "l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w=="; }; }; - "esbuild-0.20.2" = { + "esbuild-0.21.5" = { name = "esbuild"; packageName = "esbuild"; - version = "0.20.2"; + version = "0.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"; - sha512 = "WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"; + sha512 = "mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="; }; }; "esbuild-android-64-0.14.47" = { @@ -25242,15 +24657,6 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.45.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz"; - sha512 = "pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw=="; - }; - }; "eslint-8.57.0" = { name = "eslint"; packageName = "eslint"; @@ -25260,13 +24666,13 @@ let sha512 = "dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ=="; }; }; - "eslint-9.4.0" = { + "eslint-9.5.0" = { name = "eslint"; packageName = "eslint"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.4.0.tgz"; - sha512 = "sjc7Y8cUD1IlwYcTS9qPSvGjAC8Ne9LctpxKKu3x/1IC9bnOg98Zy6GxEJUfr1NojMgVPlyANXYns8oE2c1TAA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz"; + sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -25287,69 +24693,6 @@ let sha512 = "Uick451FoL22/wXqyScX3inW8ZlD/GQO7eFXj3bqb6N/ZtuuF00/CwSNIKLbFCJPrX5V4EdQBSgJ/UVnmLRnug=="; }; }; - "eslint-import-resolver-node-0.3.9" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz"; - sha512 = "WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g=="; - }; - }; - "eslint-module-utils-2.8.1" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz"; - sha512 = "rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q=="; - }; - }; - "eslint-plugin-import-2.28.1" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.28.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz"; - sha512 = "9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A=="; - }; - }; - "eslint-plugin-react-7.33.2" = { - name = "eslint-plugin-react"; - packageName = "eslint-plugin-react"; - version = "7.33.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz"; - sha512 = "73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw=="; - }; - }; - "eslint-plugin-react-hooks-4.6.2" = { - name = "eslint-plugin-react-hooks"; - packageName = "eslint-plugin-react-hooks"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz"; - sha512 = "QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ=="; - }; - }; - "eslint-plugin-react-refresh-0.4.7" = { - name = "eslint-plugin-react-refresh"; - packageName = "eslint-plugin-react-refresh"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.7.tgz"; - sha512 = "yrj+KInFmwuQS2UQcg1SF83ha1tuHC1jMQbRNyuWtlEzzKRDgAl7L4Yp4NlDUZTZNlWvHEzOtJhMi40R7JxcSw=="; - }; - }; - "eslint-plugin-unicorn-48.0.1" = { - name = "eslint-plugin-unicorn"; - packageName = "eslint-plugin-unicorn"; - version = "48.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz"; - sha512 = "FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw=="; - }; - }; "eslint-plugin-vue-7.20.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -25656,13 +24999,13 @@ let sha512 = "J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw=="; }; }; - "ethereum-cryptography-2.1.3" = { + "ethereum-cryptography-2.2.0" = { name = "ethereum-cryptography"; packageName = "ethereum-cryptography"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.3.tgz"; - sha512 = "BlwbIL7/P45W8FGW2r7LGuvoEZ+7PWsniMvQ4p5s2xCyw9tmaDlpfsN9HjAucbF+t/qpVHwZUisgfK24TCW8aA=="; + url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.0.tgz"; + sha512 = "hsm9JhfytIf8QME/3B7j4bc8V+VdTU+Vas1aJlvIS96ffoNAosudXvGoEvWmc7QZYdkC8mrMJz9r0fcbw7GyCA=="; }; }; "ethjs-unit-0.1.6" = { @@ -25908,6 +25251,15 @@ let sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="; }; }; + "execa-9.2.0" = { + name = "execa"; + packageName = "execa"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-9.2.0.tgz"; + sha512 = "vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg=="; + }; + }; "execall-2.0.0" = { name = "execall"; packageName = "execall"; @@ -26601,15 +25953,6 @@ let sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; }; }; - "fast-uri-2.3.0" = { - name = "fast-uri"; - packageName = "fast-uri"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-uri/-/fast-uri-2.3.0.tgz"; - sha512 = "eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw=="; - }; - }; "fast-url-parser-1.1.3" = { name = "fast-url-parser"; packageName = "fast-url-parser"; @@ -26835,6 +26178,15 @@ let sha512 = "ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg=="; }; }; + "figures-6.1.0" = { + name = "figures"; + packageName = "figures"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz"; + sha512 = "d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg=="; + }; + }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -27393,13 +26745,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.237.2" = { + "flow-parser-0.238.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.237.2"; + version = "0.238.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.237.2.tgz"; - sha512 = "mvI/kdfr3l1waaPbThPA8dJa77nHXrfZIun+SWvFwSwDjmeByU7mGJGRmv1+7guU6ccyLV8e1lqZA1lD4iMGnQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.238.0.tgz"; + sha512 = "VE7XSv1epljsIN2YeBnxCmGJihpNIAnLLu/pPOdA+Gkso7qDltJwUi6vfHjgxdBbjSdAuPGnhuOHJUQG+yYwIg=="; }; }; "fluent-ffmpeg-2.1.3" = { @@ -27537,22 +26889,13 @@ let sha512 = "J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw=="; }; }; - "foreground-child-2.0.0" = { + "foreground-child-3.2.0" = { name = "foreground-child"; packageName = "foreground-child"; - version = "2.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz"; - sha512 = "dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA=="; - }; - }; - "foreground-child-3.1.1" = { - name = "foreground-child"; - packageName = "foreground-child"; - version = "3.1.1"; - 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.2.0.tgz"; + sha512 = "CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA=="; }; }; "forever-agent-0.6.1" = { @@ -27753,13 +27096,13 @@ let sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="; }; }; - "fromentries-1.3.2" = { - name = "fromentries"; - packageName = "fromentries"; - version = "1.3.2"; + "front-matter-4.0.2" = { + name = "front-matter"; + packageName = "front-matter"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz"; - sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg=="; + url = "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz"; + sha512 = "I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg=="; }; }; "fs-chunk-store-1.7.0" = { @@ -28509,6 +27852,15 @@ let sha512 = "VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="; }; }; + "get-stream-9.0.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz"; + sha512 = "kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA=="; + }; + }; "get-symbol-description-1.0.2" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -29068,6 +28420,15 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; + "globby-11.0.3" = { + name = "globby"; + packageName = "globby"; + version = "11.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + }; + }; "globby-11.1.0" = { name = "globby"; packageName = "globby"; @@ -29410,15 +28771,6 @@ let sha512 = "tdcqOOpwArNjEr0gNQKCXwaNCWnQJrog14nJNQPeemcLnXQUUGrsCWpWkVKt46zLjcS6/KGoayeJfHHyPDlvwA=="; }; }; - "graphql-14.7.0" = { - name = "graphql"; - packageName = "graphql"; - version = "14.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz"; - sha512 = "l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA=="; - }; - }; "graphql-15.3.0" = { name = "graphql"; packageName = "graphql"; @@ -29446,6 +28798,15 @@ let sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; }; }; + "graphql-16.8.2" = { + name = "graphql"; + packageName = "graphql"; + version = "16.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz"; + sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg=="; + }; + }; "graphql-config-3.0.3" = { name = "graphql-config"; packageName = "graphql-config"; @@ -29923,15 +29284,6 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasha-5.2.2" = { - name = "hasha"; - packageName = "hasha"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz"; - sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ=="; - }; - }; "hashids-1.1.4" = { name = "hashids"; packageName = "hashids"; @@ -30301,24 +29653,6 @@ let sha512 = "K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA=="; }; }; - "html-escaper-2.0.2" = { - name = "html-escaper"; - packageName = "html-escaper"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"; - sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; - }; - }; - "html-link-extractor-1.0.5" = { - name = "html-link-extractor"; - packageName = "html-link-extractor"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/html-link-extractor/-/html-link-extractor-1.0.5.tgz"; - sha512 = "ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw=="; - }; - }; "html-minifier-4.0.0" = { name = "html-minifier"; packageName = "html-minifier"; @@ -30787,6 +30121,15 @@ let sha512 = "AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="; }; }; + "human-signals-7.0.0" = { + name = "human-signals"; + packageName = "human-signals"; + version = "7.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=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -30958,15 +30301,6 @@ let sha512 = "5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="; }; }; - "ignore-by-default-1.0.1" = { - name = "ignore-by-default"; - packageName = "ignore-by-default"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; - sha512 = "Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA=="; - }; - }; "ignore-walk-3.0.4" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -31678,15 +31012,6 @@ let sha512 = "v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA=="; }; }; - "intercept-stdout-0.1.2" = { - name = "intercept-stdout"; - packageName = "intercept-stdout"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/intercept-stdout/-/intercept-stdout-0.1.2.tgz"; - sha512 = "Umb41Ryp5FzLurfCRAWx+jjNAk8jsw2RTk2XPIwus+86h/Y2Eb4DfOWof/mZ6FBww8SoO45rJSlg25054/Di9w=="; - }; - }; "internal-ip-1.2.0" = { name = "internal-ip"; packageName = "internal-ip"; @@ -32011,15 +31336,6 @@ let sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; - "is-absolute-url-4.0.1" = { - name = "is-absolute-url"; - packageName = "is-absolute-url"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz"; - sha512 = "/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="; - }; - }; "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -32101,15 +31417,6 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-async-function-2.0.0" = { - name = "is-async-function"; - packageName = "is-async-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz"; - sha512 = "Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA=="; - }; - }; "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; @@ -32164,15 +31471,6 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-builtin-module-3.2.1" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz"; - sha512 = "BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A=="; - }; - }; "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; @@ -32389,15 +31687,6 @@ let sha512 = "ZGMuc+xA8mRnrXtmtf2l/EkIW2zaD2LSBWlaOVEF6yH4RTndHob65V4SwWWdtGKVthQfXPVKsXqw4TDUjbVxVQ=="; }; }; - "is-finalizationregistry-1.0.2" = { - name = "is-finalizationregistry"; - packageName = "is-finalizationregistry"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz"; - sha512 = "0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw=="; - }; - }; "is-finite-1.1.0" = { name = "is-finite"; packageName = "is-finite"; @@ -33055,15 +32344,6 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-relative-url-4.0.0" = { - name = "is-relative-url"; - packageName = "is-relative-url"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-4.0.0.tgz"; - sha512 = "PkzoL1qKAYXNFct5IKdKRH/iBQou/oCC85QhXj6WKtUQBliZ4Yfd3Zk27RHu9KQG8r6zgvAA2AQKC9p+rqTszg=="; - }; - }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -33163,6 +32443,15 @@ let sha512 = "LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="; }; }; + "is-stream-4.0.1" = { + name = "is-stream"; + packageName = "is-stream"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz"; + sha512 = "Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A=="; + }; + }; "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; @@ -33253,6 +32542,15 @@ let sha512 = "43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ=="; }; }; + "is-unicode-supported-2.0.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz"; + sha512 = "FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q=="; + }; + }; "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; @@ -33460,15 +32758,6 @@ let sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; }; - "isemail-3.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz"; - sha512 = "zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg=="; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -33505,15 +32794,6 @@ let sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; }; - "isomorphic-fetch-3.0.0" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz"; - sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; - }; - }; "isomorphic-textencoder-1.0.1" = { name = "isomorphic-textencoder"; packageName = "isomorphic-textencoder"; @@ -33559,69 +32839,6 @@ let sha512 = "X3HBmm7+Th+l4/kMtqwcHHgELD0Lfl0Ina6S3+grr+mKmTxsrM84NAO1UuRPIxIbGLIl3TCEu45S1kdu21HYbQ=="; }; }; - "istanbul-lib-coverage-3.2.2" = { - name = "istanbul-lib-coverage"; - packageName = "istanbul-lib-coverage"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz"; - sha512 = "O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="; - }; - }; - "istanbul-lib-hook-3.0.0" = { - name = "istanbul-lib-hook"; - packageName = "istanbul-lib-hook"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz"; - sha512 = "Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ=="; - }; - }; - "istanbul-lib-instrument-4.0.3" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; - }; - }; - "istanbul-lib-processinfo-2.0.3" = { - name = "istanbul-lib-processinfo"; - packageName = "istanbul-lib-processinfo"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz"; - sha512 = "NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg=="; - }; - }; - "istanbul-lib-report-3.0.1" = { - name = "istanbul-lib-report"; - packageName = "istanbul-lib-report"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz"; - sha512 = "GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw=="; - }; - }; - "istanbul-lib-source-maps-4.0.1" = { - name = "istanbul-lib-source-maps"; - packageName = "istanbul-lib-source-maps"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; - sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; - }; - }; - "istanbul-reports-3.1.7" = { - name = "istanbul-reports"; - packageName = "istanbul-reports"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz"; - sha512 = "BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g=="; - }; - }; "isuri-2.0.3" = { name = "isuri"; packageName = "isuri"; @@ -33658,15 +32875,6 @@ let sha512 = "QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="; }; }; - "iterator.prototype-1.1.2" = { - name = "iterator.prototype"; - packageName = "iterator.prototype"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz"; - sha512 = "DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w=="; - }; - }; "jackspeak-2.3.6" = { name = "jackspeak"; packageName = "jackspeak"; @@ -33676,13 +32884,13 @@ let sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; }; }; - "jackspeak-3.2.3" = { + "jackspeak-3.4.0" = { name = "jackspeak"; packageName = "jackspeak"; - version = "3.2.3"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.2.3.tgz"; - sha512 = "htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz"; + sha512 = "JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw=="; }; }; "jade-0.27.0" = { @@ -33703,15 +32911,6 @@ let sha512 = "61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w=="; }; }; - "javascript-natural-sort-0.7.1" = { - name = "javascript-natural-sort"; - packageName = "javascript-natural-sort"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; - sha512 = "nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="; - }; - }; "javascript-stringify-2.1.0" = { name = "javascript-stringify"; packageName = "javascript-stringify"; @@ -33766,13 +32965,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jiti-1.21.0" = { + "jiti-1.21.6" = { name = "jiti"; packageName = "jiti"; - version = "1.21.0"; + version = "1.21.6"; src = fetchurl { - url = "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz"; - sha512 = "gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q=="; + url = "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz"; + sha512 = "2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w=="; }; }; "jju-1.4.0" = { @@ -34117,22 +33316,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsesc-3.0.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; - sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; - }; - }; - "jsii-1.99.0" = { + "jsii-1.100.0" = { name = "jsii"; packageName = "jsii"; - version = "1.99.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.99.0.tgz"; - sha512 = "t8fyMzjYr1WVFcSs6oCOgQM3Ikycu89HcZM61C/DRpOfSACLoKoB5oAD23zNdl/fvdDpJSXVRQ4NIDRVmQF3ug=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.100.0.tgz"; + sha512 = "DUTvq90XyyIRE+O/CAIHXZwBsxVy9ZkFDGkDjUknYV84VyzlMnBkdptQq0oJj8LRPTMJl2yiiPPMsJCvuv01Xg=="; }; }; "jsii-5.3.29" = { @@ -34144,13 +33334,22 @@ let sha512 = "vEEOtjD8s/C8ORHvN87Bt9jHcY1diJoC1sS+TVnCkeb4V9q5fOEVr4gl/FsU5ea8dSWZHdd7VqCtr0jYAwKleg=="; }; }; - "jsii-5.4.20" = { + "jsii-5.4.21" = { name = "jsii"; packageName = "jsii"; - version = "5.4.20"; + version = "5.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.4.20.tgz"; - sha512 = "kZoopDv3Gy6wKOt6aYzPhMvEErOAnQXoeUjd3sGAODey/mUVJRvXoScYVvmmtVgKqt+120OFPhVRWzgefwio+g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.4.21.tgz"; + sha512 = "uCruIDzEEFHBwZRT5PiRSd2/KdsZWwHq8VWS5o8p5tngUGpz4BYdEG/jmOKYyjVz+ScVx+Ur/eN2zieTP6Ge2Q=="; + }; + }; + "jsii-pacmak-1.100.0" = { + name = "jsii-pacmak"; + packageName = "jsii-pacmak"; + version = "1.100.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.100.0.tgz"; + sha512 = "MxB4UYwpRjxZ/2y+LPy5HVkBciubU4T8d3A3mnj6Pj5lQfe3VZ9pStYHNTsv0q5J8xg4uIcc8/RhFHj1mzk2oA=="; }; }; "jsii-pacmak-1.95.0" = { @@ -34162,31 +33361,22 @@ let sha512 = "h/eo3p3jG4/Wtb9WdavvcgXzyN5QXZck3k0xvIWp5SKxFLorQ+TWhY7BHG0e+VXl+mxcni6BuQ5wFLavq65RQQ=="; }; }; - "jsii-pacmak-1.99.0" = { - name = "jsii-pacmak"; - packageName = "jsii-pacmak"; - version = "1.99.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.99.0.tgz"; - sha512 = "3oqqlqxeYfGi6LOfFfZ2Wpf4GxGnPGOwKh5dwUtP5SPmDdhJOkti8nREE1JPYSlzWSSCzJZHAwaXEN+K7aFQSg=="; - }; - }; - "jsii-reflect-1.99.0" = { + "jsii-reflect-1.100.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.99.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.99.0.tgz"; - sha512 = "ro26sl1u7osaPBMMXNF3K0bHtYgZKAB3+ojjqaoDuCc/MZ1u9ZS3duPJ95Qo5Izvh9Ae9yezzNB3Qrtvyzfxrg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.100.0.tgz"; + sha512 = "4hicwZirzhSqFRpX/USpvy6RewDi5mCkDESLjBSNpnGWhc3oVByX3x/KJyKQdjEfjVkflHWxSGJEA0qEMoXFUw=="; }; }; - "jsii-rosetta-1.99.0" = { + "jsii-rosetta-1.100.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.99.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.99.0.tgz"; - sha512 = "6b8MgL8VI96wJEfBbGLmzpMxm/JZopNzyCCsPNGpe+e/pql17sntY33sbNwOEtG+jBPcBUD4i4V0zH5hNIl1BQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.100.0.tgz"; + sha512 = "JeVS7twbDM48Z6IE9OJ24DzBs9scpeWa9XmI00bggMWV0xcP2GCTkz2c8cqEZU4DPggcygS1H+TWhQiSkol4gQ=="; }; }; "jsii-rosetta-5.3.28" = { @@ -34216,13 +33406,13 @@ let sha512 = "3lBjyxBy5UpPGK8bXFmVRzaoK6caDQ5DO40Qbyv3LOWtrsuUQmuVI2/5wRwNtfg6sFzOFD3+kE3LZuNXo7QE/Q=="; }; }; - "jsii-srcmak-0.1.1143" = { + "jsii-srcmak-0.1.1154" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.1143"; + version = "0.1.1154"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1143.tgz"; - sha512 = "DXVsQugr/7obajyv0PXFm6dgetzRoG+QbEta3IG4a/OQ5qHLSMdkr+04wzBe1WqukXg68Do9+DI4goLtY+BixQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1154.tgz"; + sha512 = "x2iOuiUAg4xhk3dEz67ElrbSdMk+KSHCOV9CT82PWrmehXg+kZ4pudoAk8/4KLiS9UR0ZLtugZQQPMIZp6E67w=="; }; }; "json-buffer-3.0.0" = { @@ -34432,13 +33622,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.4.3" = { + "json2jsii-0.4.4" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.4.3.tgz"; - sha512 = "9PNmX7v94XVR5RiblCvtoCbFy3HALnRqZWLT8LSXEE7wujudmMXzdSFyyK0YwYd7dxpzNXirPf6eoQG5xL9N5A=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.4.4.tgz"; + sha512 = "jTbmFuxivo20zb/JOKc2U5/qSFWsobJmglvmWVdQoWdR2Ip9KtY9t679QLs7TV/oYSY3VnJU83IWL1QH0eI/4w=="; }; }; "json3-3.2.6" = { @@ -34468,15 +33658,6 @@ let sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; - "json5-relaxed-0.5.4" = { - name = "json5-relaxed"; - packageName = "json5-relaxed"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/json5-relaxed/-/json5-relaxed-0.5.4.tgz"; - sha512 = "oDPf7b6nFDKcX2qt5OLI/ZwGwH43qS/g2Z98UWo8ChoNtVMYdGa3Y48WHvjPqvNKnTUa2fOanvHFeE7ZxkiboQ=="; - }; - }; "jsonata-1.8.7" = { name = "jsonata"; packageName = "jsonata"; @@ -34693,15 +33874,6 @@ let sha512 = "C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A=="; }; }; - "jsx-ast-utils-3.3.5" = { - name = "jsx-ast-utils"; - packageName = "jsx-ast-utils"; - version = "3.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz"; - sha512 = "ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ=="; - }; - }; "jszip-3.10.1" = { name = "jszip"; packageName = "jszip"; @@ -35449,13 +34621,13 @@ let sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; }; }; - "lilconfig-3.1.1" = { + "lilconfig-3.1.2" = { name = "lilconfig"; packageName = "lilconfig"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz"; - sha512 = "O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz"; + sha512 = "eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow=="; }; }; "limit-spawn-0.0.3" = { @@ -35521,15 +34693,6 @@ let sha512 = "8oI90ziJlcTi4k2DnQ0o0Waa2Uk00xbIN8ylvhstEqfJtiRaB4LJ6u8H63If7zTrnnuhCw8SjTJoHf+wLs3ICg=="; }; }; - "link-check-5.3.0" = { - name = "link-check"; - packageName = "link-check"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-5.3.0.tgz"; - sha512 = "Jhb7xueDgQgBaZzkfOtAyOZEZAIMJQIjUpYD2QY/zEB+LKTY1tWiBwZg8QIDbzQdPBOcqzg7oLQDNcES/tQmXg=="; - }; - }; "linkify-it-2.2.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -35917,15 +35080,6 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash._arraycopy-3.0.0" = { - name = "lodash._arraycopy"; - packageName = "lodash._arraycopy"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"; - sha512 = "RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A=="; - }; - }; "lodash._arrayeach-3.0.0" = { name = "lodash._arrayeach"; packageName = "lodash._arrayeach"; @@ -36241,15 +35395,6 @@ let sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha512 = "uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="; - }; - }; "lodash.foreach-3.0.3" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -36655,15 +35800,6 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; - "lodash.toarray-3.0.2" = { - name = "lodash.toarray"; - packageName = "lodash.toarray"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-3.0.2.tgz"; - sha512 = "ptkjUqvuHjTuMJJxiktJpZhxM5l60bEkfntJx+NFzdQd1bZVxfpTF1bhFYFqBrT4F0wZ1qx9KbVmHJV3Rfc7Tw=="; - }; - }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -37619,15 +36755,6 @@ let sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ=="; }; }; - "markdown-link-extractor-4.0.2" = { - name = "markdown-link-extractor"; - packageName = "markdown-link-extractor"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-4.0.2.tgz"; - sha512 = "5cUOu4Vwx1wenJgxaudsJ8xwLUMN7747yDJX3V/L7+gi3e4MsCm7w5nbrDQQy8nEfnl4r5NV3pDXMAjhGXYXAw=="; - }; - }; "markdown-table-3.0.3" = { name = "markdown-table"; packageName = "markdown-table"; @@ -37637,15 +36764,6 @@ let sha512 = "Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw=="; }; }; - "marked-12.0.2" = { - name = "marked"; - packageName = "marked"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz"; - sha512 = "qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q=="; - }; - }; "marked-4.3.0" = { name = "marked"; packageName = "marked"; @@ -37754,6 +36872,24 @@ let sha512 = "HED3ezseRVkBzZ0uK4q6RJMdufr/2p3VfVZstE3H1N9K8bwtspztWo6Xd7rEatuGNoCXaBna8oEqMwUn0Ve1bw=="; }; }; + "mdast-comment-marker-3.0.0" = { + name = "mdast-comment-marker"; + packageName = "mdast-comment-marker"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-3.0.0.tgz"; + sha512 = "bt08sLmTNg00/UtVDiqZKocxqvQqqyQZAg1uaRuO/4ysXV5motg7RolF5o5yy/sY1rG0v2XgZEqFWho1+2UquA=="; + }; + }; + "mdast-util-directive-3.0.0" = { + name = "mdast-util-directive"; + packageName = "mdast-util-directive"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-directive/-/mdast-util-directive-3.0.0.tgz"; + sha512 = "JUpYOqKI4mM3sZcNxmF/ox04XYFFkNwr0CFlrQIkCwbvH0xzMCqkMqAde9wRd80VAhaUrwFwKm2nxretdT1h7Q=="; + }; + }; "mdast-util-find-and-replace-2.2.2" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -37853,13 +36989,13 @@ let sha512 = "PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ=="; }; }; - "mdast-util-heading-style-2.0.1" = { + "mdast-util-heading-style-3.0.0" = { name = "mdast-util-heading-style"; packageName = "mdast-util-heading-style"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-2.0.1.tgz"; - sha512 = "0L5rthU4xKDVbw+UQ7D8Y8xOEsX4JXZvemWoEAsL+WAaeSH+TvVVwFnTb3G/OrjyP4VYQULoNWU+PdZfkmNu4A=="; + url = "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-3.0.0.tgz"; + sha512 = "tsUfM9Kj9msjlemA/38Z3pvraQay880E3zP2NgIthMoGcpU9bcPX9oSM6QC/+eFXGGB4ba+VCB1dKAPHB7Veug=="; }; }; "mdast-util-mdx-2.0.1" = { @@ -37871,6 +37007,15 @@ let sha512 = "38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw=="; }; }; + "mdast-util-mdx-3.0.0" = { + name = "mdast-util-mdx"; + packageName = "mdast-util-mdx"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz"; + sha512 = "JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w=="; + }; + }; "mdast-util-mdx-expression-1.3.2" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; @@ -37880,6 +37025,15 @@ let sha512 = "xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA=="; }; }; + "mdast-util-mdx-expression-2.0.0" = { + name = "mdast-util-mdx-expression"; + packageName = "mdast-util-mdx-expression"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.0.tgz"; + sha512 = "fGCu8eWdKUKNu5mohVGkhBXCXGnOTLuFqOvGMvdikr+J1w7lDJgxThOKpwRWzzbyXAU2hhSwsmssOY4yTokluw=="; + }; + }; "mdast-util-mdx-jsx-2.1.4" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; @@ -37889,6 +37043,15 @@ let sha512 = "DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA=="; }; }; + "mdast-util-mdx-jsx-3.1.2" = { + name = "mdast-util-mdx-jsx"; + packageName = "mdast-util-mdx-jsx"; + version = "3.1.2"; + 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=="; + }; + }; "mdast-util-mdxjs-esm-1.3.1" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; @@ -37898,6 +37061,15 @@ let sha512 = "SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w=="; }; }; + "mdast-util-mdxjs-esm-2.0.1" = { + name = "mdast-util-mdxjs-esm"; + packageName = "mdast-util-mdxjs-esm"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz"; + sha512 = "EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg=="; + }; + }; "mdast-util-phrasing-3.0.1" = { name = "mdast-util-phrasing"; packageName = "mdast-util-phrasing"; @@ -38348,15 +37520,6 @@ let sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="; }; }; - "microee-0.0.6" = { - name = "microee"; - packageName = "microee"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; - sha512 = "/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A=="; - }; - }; "micromark-2.11.4" = { name = "micromark"; packageName = "micromark"; @@ -39203,22 +38366,13 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20240524.1" = { + "miniflare-3.20240610.0" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20240524.1"; + version = "3.20240610.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240524.1.tgz"; - sha512 = "5d3pRxvd5pT7lX1SsBH9+AjXuyHJnChSNOnYhubfi7pxMek4ZfULwhnUmNUp1R7b2xKuzqdFDZa0fsZuUoFxlw=="; - }; - }; - "minilog-3.1.0" = { - name = "minilog"; - packageName = "minilog"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; - sha512 = "Xfm4jWjWzSAduvEWtuZX/8TMkxfJlCfH7XvikCZe3ptojYTBq1eoEs3rh9/3LNLOckUP86m+8l8+Iw5NU/pBww=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240610.0.tgz"; + sha512 = "J6aXmkII5gcq+kC4TurxKiR4rC++apPST/K8P/YjqoQQgrJ+NRPacBhf6iVh8R3ujnXYXaq+Ae+gm+LM0XHK/w=="; }; }; "minimalistic-assert-1.0.1" = { @@ -39347,6 +38501,15 @@ let sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w=="; }; }; + "minimatch-9.0.2" = { + name = "minimatch"; + packageName = "minimatch"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz"; + sha512 = "PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg=="; + }; + }; "minimatch-9.0.3" = { name = "minimatch"; packageName = "minimatch"; @@ -39869,15 +39032,6 @@ let sha512 = "L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA=="; }; }; - "muggle-string-0.2.2" = { - name = "muggle-string"; - packageName = "muggle-string"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/muggle-string/-/muggle-string-0.2.2.tgz"; - sha512 = "YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg=="; - }; - }; "muggle-string-0.4.1" = { name = "muggle-string"; packageName = "muggle-string"; @@ -40049,13 +39203,13 @@ let sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; }; }; - "nan-2.19.0" = { + "nan-2.20.0" = { name = "nan"; packageName = "nan"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz"; - sha512 = "nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz"; + sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; "nanoid-2.1.11" = { @@ -40130,15 +39284,6 @@ let sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; - "natural-compare-lite-1.4.0" = { - name = "natural-compare-lite"; - packageName = "natural-compare-lite"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha512 = "Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="; - }; - }; "natural-orderby-2.0.3" = { name = "natural-orderby"; packageName = "natural-orderby"; @@ -40446,13 +39591,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.63.0" = { + "node-abi-3.65.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.63.0"; + version = "3.65.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.63.0.tgz"; - sha512 = "vAszCsOUrUxjGAmdnM/pq7gUgie0IRteCQMX6d4A534fQCR93EJU5qgzBvU6EkFfK27s0T3HEV3BOyJIr7OMYw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz"; + sha512 = "ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA=="; }; }; "node-abort-controller-3.1.1" = { @@ -40680,6 +39825,15 @@ let sha512 = "ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg=="; }; }; + "node-fetch-native-1.6.4" = { + name = "node-fetch-native"; + packageName = "node-fetch-native"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz"; + sha512 = "IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ=="; + }; + }; "node-forge-0.10.0" = { name = "node-forge"; packageName = "node-forge"; @@ -40842,15 +39996,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-preload-0.2.1" = { - name = "node-preload"; - packageName = "node-preload"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz"; - sha512 = "RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ=="; - }; - }; "node-readfiles-0.2.0" = { name = "node-readfiles"; packageName = "node-readfiles"; @@ -41382,13 +40527,13 @@ let sha512 = "8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA=="; }; }; - "npm-registry-fetch-17.0.1" = { + "npm-registry-fetch-17.1.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "17.0.1"; + version = "17.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.0.1.tgz"; - sha512 = "fLu9MTdZTlJAHUek/VLklE6EpIiP3VZpTiuN7OOMCt2Sd67NCpSEetMaxHHEZiZxllp8ZLsUpvbEszqTFEc+wA=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz"; + sha512 = "5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA=="; }; }; "npm-run-path-2.0.2" = { @@ -41562,22 +40707,13 @@ let sha512 = "QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ=="; }; }; - "nx-19.1.2" = { + "nx-19.3.0" = { name = "nx"; packageName = "nx"; - version = "19.1.2"; + version = "19.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-19.1.2.tgz"; - sha512 = "hqD0HglmZCqgPLGcEfLq79El9iBUlinoncmsk6wsPHJM1IrASxHkemJZiehYilQx55QACd1MGBjC2nySZmgyLA=="; - }; - }; - "nyc-15.1.0" = { - name = "nyc"; - packageName = "nyc"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz"; - sha512 = "jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A=="; + url = "https://registry.npmjs.org/nx/-/nx-19.3.0.tgz"; + sha512 = "WILWiROUkZWwuPJ12tP24Z0NULPEhxFN9i55/fECuVXYaFtkg6FvEne9C4d4bRqhZPcbrz6WhHnzE3NhdjH7XQ=="; }; }; "oas-kit-common-1.0.8" = { @@ -41796,24 +40932,6 @@ let sha512 = "c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA=="; }; }; - "object.entries-1.1.8" = { - name = "object.entries"; - packageName = "object.entries"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz"; - sha512 = "cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ=="; - }; - }; - "object.fromentries-2.0.8" = { - name = "object.fromentries"; - packageName = "object.fromentries"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz"; - sha512 = "k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ=="; - }; - }; "object.getownpropertydescriptors-2.1.8" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; @@ -41823,24 +40941,6 @@ let sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A=="; }; }; - "object.groupby-1.0.3" = { - name = "object.groupby"; - packageName = "object.groupby"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz"; - sha512 = "+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ=="; - }; - }; - "object.hasown-1.1.4" = { - name = "object.hasown"; - packageName = "object.hasown"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz"; - sha512 = "FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg=="; - }; - }; "object.map-1.0.1" = { name = "object.map"; packageName = "object.map"; @@ -41868,15 +40968,6 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.2.0" = { - name = "object.values"; - packageName = "object.values"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz"; - sha512 = "yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ=="; - }; - }; "obliterator-2.0.4" = { name = "obliterator"; packageName = "obliterator"; @@ -42021,13 +41112,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.99.0" = { + "oo-ascii-tree-1.100.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.99.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.99.0.tgz"; - sha512 = "/BTLvFECySvAwOUeu/iSkhQk+WXH8FPcXOrjbadlnWuNwYtNH5jcEOxyBkL0sT6WvmFFsogRu2zLb2H/nPCJrQ=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.100.0.tgz"; + sha512 = "Y/C4AN9IVjsIyNQ1iK4x65xe2AV9q0MtXlYAOKZLA2ZscOzZJbRNi0BzcpmeMb/DSIAFm9M5kaxLqdAKpETbHg=="; }; }; "open-0.0.2" = { @@ -42273,6 +41364,15 @@ let sha512 = "0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw=="; }; }; + "ora-8.0.1" = { + name = "ora"; + packageName = "ora"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-8.0.1.tgz"; + sha512 = "ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ=="; + }; + }; "ordered-binary-1.5.1" = { name = "ordered-binary"; packageName = "ordered-binary"; @@ -42813,15 +41913,6 @@ let sha512 = "5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg=="; }; }; - "package-hash-4.0.0" = { - name = "package-hash"; - packageName = "package-hash"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz"; - sha512 = "whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ=="; - }; - }; "package-json-1.2.0" = { name = "package-json"; packageName = "package-json"; @@ -43146,6 +42237,15 @@ let sha512 = "kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="; }; }; + "parse-ms-4.0.0" = { + name = "parse-ms"; + packageName = "parse-ms"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz"; + sha512 = "TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw=="; + }; + }; "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; @@ -43749,6 +42849,15 @@ let sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; }; }; + "pathe-1.1.2" = { + name = "pathe"; + packageName = "pathe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz"; + sha512 = "whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ=="; + }; + }; "pause-0.0.1" = { name = "pause"; packageName = "pause"; @@ -44496,13 +43605,13 @@ let sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="; }; }; - "postcss-merge-longhand-7.0.0" = { + "postcss-merge-longhand-7.0.1" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.0.tgz"; - sha512 = "0X8I4/9+G03X5/5NnrfopG/YEln2XU8heDh7YqBaiq2SeaKIG3n66ShZPjIolmVuLBQ0BEm3yS8o1mlCLHdW7A=="; + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.1.tgz"; + sha512 = "qZlD26hnqSTMxSSOMS8+QCeRWtqOdMKeQHvHcBhjL3mJxKUs47cvO1Y1x3iTdYIk3ioMcRHTiy229TT0mEMH/A=="; }; }; "postcss-merge-rules-5.1.4" = { @@ -44514,13 +43623,13 @@ let sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; }; }; - "postcss-merge-rules-7.0.0" = { + "postcss-merge-rules-7.0.1" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.0.tgz"; - sha512 = "Zty3VlOsD6VSjBMu6PiHCVpLegtBT/qtZRVBcSeyEZ6q1iU5qTYT0WtEoLRV+YubZZguS5/ycfP+NRiKfjv6aw=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.1.tgz"; + sha512 = "bb8McYQbo2etgs0uVt6AfngajACK3FHSVP3sGLhprrjbtHJWgG03JZ4KKBlJ8/5Fb8/Rr+mMKaybMYeoYrAg0A=="; }; }; "postcss-minify-font-values-5.1.0" = { @@ -44586,13 +43695,13 @@ let sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; }; }; - "postcss-minify-selectors-7.0.0" = { + "postcss-minify-selectors-7.0.1" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.0.tgz"; - sha512 = "f00CExZhD6lNw2vTZbcnmfxVgaVKzUw6IRsIFX3JTT8GdsoABc1WnhhGwL1i8YPJ3sSWw39fv7XPtvLb+3Uitw=="; + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.1.tgz"; + sha512 = "YfIbGtcgMFquPxV2L/ASs36ZS4DsgfcDX9tQ8cTEIvBTv+0GXFKtcvvpi9tCKto/+DWGWYKMCESFG3Pnan0Feg=="; }; }; "postcss-modules-extract-imports-3.1.0" = { @@ -44937,13 +44046,13 @@ let sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; }; }; - "postcss-svgo-7.0.0" = { + "postcss-svgo-7.0.1" = { name = "postcss-svgo"; packageName = "postcss-svgo"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.0.tgz"; - sha512 = "Xj5DRdvA97yRy3wjbCH2NKXtDUwEnph6EHr5ZXszsBVKCNrKXYBjzAXqav7/Afz5WwJ/1peZoTguCEJIg7ytmA=="; + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.1.tgz"; + sha512 = "0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA=="; }; }; "postcss-syntax-0.36.2" = { @@ -44964,13 +44073,13 @@ let sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; }; }; - "postcss-unique-selectors-7.0.0" = { + "postcss-unique-selectors-7.0.1" = { name = "postcss-unique-selectors"; packageName = "postcss-unique-selectors"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.0.tgz"; - sha512 = "NYFqcft7vVQMZlQPsMdMPy+qU/zDpy95Malpw4GeA9ZZjM6dVXDshXtDmLc0m4WCD6XeZCJqjTfPT1USsdt+rA=="; + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.1.tgz"; + sha512 = "MH7QE/eKUftTB5ta40xcHLl7hkZjgDFydpfTK+QWXeHxghVt3VoPqYL5/G+zYZPPIs+8GuqFXSTgxBSoB1RZtQ=="; }; }; "postcss-value-parser-4.2.0" = { @@ -45135,22 +44244,13 @@ let sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; }; }; - "prettier-3.0.3" = { + "prettier-3.3.2" = { name = "prettier"; packageName = "prettier"; - version = "3.0.3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz"; - sha512 = "L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg=="; - }; - }; - "prettier-3.3.0" = { - name = "prettier"; - packageName = "prettier"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz"; - sha512 = "J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz"; + sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA=="; }; }; "prettier-bytes-1.0.4" = { @@ -45234,6 +44334,15 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; + "pretty-ms-9.0.0" = { + name = "pretty-ms"; + packageName = "pretty-ms"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz"; + sha512 = "E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng=="; + }; + }; "prettyjson-1.2.5" = { name = "prettyjson"; packageName = "prettyjson"; @@ -45369,15 +44478,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "process-on-spawn-1.0.0" = { - name = "process-on-spawn"; - packageName = "process-on-spawn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz"; - sha512 = "1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg=="; - }; - }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -45396,15 +44496,6 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "progress-stream-2.0.0" = { - name = "progress-stream"; - packageName = "progress-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz"; - sha512 = "xJwOWR46jcXUq6EH9yYyqp+I52skPySOeHfkxOZ2IY1AiBi/sFJhbhAKHoV3OTw/omQ45KTio9215dRJ2Yxd3Q=="; - }; - }; "prom-client-11.5.3" = { name = "prom-client"; packageName = "prom-client"; @@ -45684,15 +44775,6 @@ let sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; - "pstree.remy-1.1.8" = { - name = "pstree.remy"; - packageName = "pstree.remy"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz"; - sha512 = "77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="; - }; - }; "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; @@ -45900,22 +44982,22 @@ let sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug=="; }; }; - "puppeteer-22.10.0" = { + "puppeteer-22.11.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "22.10.0"; + version = "22.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.10.0.tgz"; - sha512 = "ZOkZd6a6t0BdKcWb0wAYHWQqCfdlN1PPnXOmg/XNrbo6gJhYWFX4qCNb6ahSn8TpAqBqLCoD4Q010F7GwOM7mA=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.11.0.tgz"; + sha512 = "U5U0Dx5Tsd/ec39BmflhcSFIK9UnZxGQfyUzvQVHivt6gIi6RgJqYL9MJaU90OG6tTz65XqzN4wF0ZyDyY0NuA=="; }; }; - "puppeteer-core-22.10.0" = { + "puppeteer-core-22.11.0" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "22.10.0"; + version = "22.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.10.0.tgz"; - sha512 = "I54J4Vy4I07UHsgB1QSmuFoF7KNQjJWcvFBPhtY+ezMdBfwgGDr8dzYrJa11aPgP9kxIUHjhktcMmmfJkOAtTw=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.11.0.tgz"; + sha512 = "57YUjhRoSpZWg9lCssWsgzM1/X/1jQnkKbbspbeW0bhZTt3TD4WdNXEYI7KrFFnSvx21tyHhfWW0zlxzbwYSAA=="; }; }; "purgecss-6.0.0" = { @@ -45945,13 +45027,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.365" = { + "pyright-1.1.367" = { name = "pyright"; packageName = "pyright"; - version = "1.1.365"; + version = "1.1.367"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.365.tgz"; - sha512 = "A5RHXB782m2wCeazfrPGSvFUd1WAjpHrD83M/Umc/tcAhyC5pzhrh23US1yv9DH/GMilQeWdJ4W8pGxmgej4DQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.367.tgz"; + sha512 = "qw6PmU59P4OAonqPEsaJ4CYHIpkr3eBsyXRpVJnmBoXldEZEoM3qdXIeo9BlsPFE+hzdNKNgBjSNAXdiOixEuw=="; }; }; "q-1.5.1" = { @@ -46485,15 +45567,6 @@ let sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; }; }; - "react-18.2.0" = { - name = "react"; - packageName = "react"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-18.2.0.tgz"; - sha512 = "/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="; - }; - }; "react-18.3.1" = { name = "react"; packageName = "react"; @@ -46512,15 +45585,6 @@ let sha512 = "cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA=="; }; }; - "react-dom-18.2.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"; - sha512 = "6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="; - }; - }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -46584,15 +45648,6 @@ let sha512 = "zZQqIiYgDCTP/f1N/mAR10nJGrPD2ZR+jDSEsKWJHYC7Cm2wodlwbR3upZRdC3cjIjSlTLNVyO7Iu0Yy7t2AYg=="; }; }; - "react-refresh-0.14.2" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz"; - sha512 = "jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="; - }; - }; "react-refresh-0.4.3" = { name = "react-refresh"; packageName = "react-refresh"; @@ -46611,24 +45666,6 @@ let sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; }; }; - "react-router-6.15.0" = { - name = "react-router"; - packageName = "react-router"; - version = "6.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz"; - sha512 = "NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg=="; - }; - }; - "react-router-dom-6.15.0" = { - name = "react-router-dom"; - packageName = "react-router-dom"; - version = "6.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz"; - sha512 = "aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ=="; - }; - }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -46836,15 +45873,6 @@ let sha512 = "5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg=="; }; }; - "read-pkg-8.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz"; - sha512 = "PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ=="; - }; - }; "read-pkg-9.0.1" = { name = "read-pkg"; packageName = "read-pkg"; @@ -47187,15 +46215,6 @@ let sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A=="; }; }; - "reflect.getprototypeof-1.0.6" = { - name = "reflect.getprototypeof"; - packageName = "reflect.getprototypeof"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz"; - sha512 = "fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg=="; - }; - }; "reftools-1.1.9" = { name = "reftools"; packageName = "reftools"; @@ -47268,15 +46287,6 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.27" = { - name = "regexp-tree"; - packageName = "regexp-tree"; - version = "0.1.27"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz"; - sha512 = "iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA=="; - }; - }; "regexp.prototype.flags-1.5.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; @@ -47376,15 +46386,6 @@ let sha512 = "+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q=="; }; }; - "regjsparser-0.10.0" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz"; - sha512 = "qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA=="; - }; - }; "regjsparser-0.9.1" = { name = "regjsparser"; packageName = "regjsparser"; @@ -47439,15 +46440,6 @@ let sha512 = "Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA=="; }; }; - "release-zalgo-1.0.0" = { - name = "release-zalgo"; - packageName = "release-zalgo"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz"; - sha512 = "gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA=="; - }; - }; "remark-13.0.0" = { name = "remark"; packageName = "remark"; @@ -47484,67 +46476,67 @@ let sha512 = "lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig=="; }; }; - "remark-lint-9.1.2" = { + "remark-lint-10.0.0" = { name = "remark-lint"; packageName = "remark-lint"; - version = "9.1.2"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint/-/remark-lint-9.1.2.tgz"; - sha512 = "m9e/aPlh7tsvfJfj8tPxrQzD6oEdb9Foko+Ya/6OwUP9EoGMfehv1Qtv26W1DoH58Wn8rT8CD+KuprTWscMmIA=="; + url = "https://registry.npmjs.org/remark-lint/-/remark-lint-10.0.0.tgz"; + sha512 = "E8yHHDOJ8b+qI0G49BRu24pe8t0fNNBWv8ENQJpCGNrVeTeyBIGEbaUe1yuF7OG8faA6PVpcN/pqWjzW9fcBWQ=="; }; }; - "remark-lint-blockquote-indentation-3.1.2" = { + "remark-lint-blockquote-indentation-4.0.0" = { name = "remark-lint-blockquote-indentation"; packageName = "remark-lint-blockquote-indentation"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-3.1.2.tgz"; - sha512 = "5DOrFsZd5dXqA4p/VZvWSrqIWNFbBXjX7IV/FkVkxlNhNF/0FMf/4v8x1I2W3mzaZ7yDsWS/egpZnmligq1ckQ=="; + url = "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-4.0.0.tgz"; + sha512 = "hdUvn+KsJbBKpY9jLY01PmfpJ/WGhLu9GJMXQGU8ADXJc+F5DWSgKAr6GQ1IUKqvGYdEML/KZ61WomWFUuecVA=="; }; }; - "remark-lint-checkbox-character-style-4.1.2" = { + "remark-lint-checkbox-character-style-5.0.0" = { name = "remark-lint-checkbox-character-style"; packageName = "remark-lint-checkbox-character-style"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-4.1.2.tgz"; - sha512 = "5ITz+1cCuJ3Jv/Q7rKgDEucCOnIgjWDnSHPJA1tb4TI/D316h+ALbDhZIpP8gyfAm6sBAh3Pwz9XZJN2uJB5UQ=="; + url = "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-5.0.0.tgz"; + sha512 = "K0G/Nok59fb2q5KUxcemBVt+ymnhTkDVLJAatZ4PAh9At8y0DGctHdU27jWsuvO0Fs7Zy62Usk7IJE2VO89p1w=="; }; }; - "remark-lint-checkbox-content-indent-4.1.2" = { + "remark-lint-checkbox-content-indent-5.0.0" = { name = "remark-lint-checkbox-content-indent"; packageName = "remark-lint-checkbox-content-indent"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-4.1.2.tgz"; - sha512 = "8uaHAm4bSqB7XpnecLRObe00Lj9eoHiecV+44CfJeWyoo50cTPR/hIMfsMtDxsNt4LZP+6oCV9z+vACJqDv8Hg=="; + url = "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-5.0.0.tgz"; + sha512 = "7L25a7TEfdogFSh4HDOnB+GTTTEiXJDMlceUPft9bzIjElI8Hm2+a2D8jUQn4ahj+j/3LmdZW4GjAeyfdPuqTA=="; }; }; - "remark-lint-code-block-style-3.1.2" = { + "remark-lint-code-block-style-4.0.0" = { name = "remark-lint-code-block-style"; packageName = "remark-lint-code-block-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-3.1.2.tgz"; - sha512 = "3wsWmzzdyEsB9sOzBOf46TSkwwVKXN2JpTEQb6feN0Tl6Vg75F7T9MHqMz7aqk/56bOXSxUzdpXDscGBhziLRA=="; + url = "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-4.0.0.tgz"; + sha512 = "LKBKMVruEO0tzDnnnqi1TfUcnwY6Mo7cVtZM4E4pKt3KMhtvgU2wD68/MxDOEJd0pmnLrEgIadv74bY0gWhZpg=="; }; }; - "remark-lint-definition-case-3.1.2" = { + "remark-lint-definition-case-4.0.0" = { name = "remark-lint-definition-case"; packageName = "remark-lint-definition-case"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-3.1.2.tgz"; - sha512 = "/VxucJKEFykOe2ILgi0LLia0RaSyOPQXpR+tuX4MK3iKxIm7aT2oINgR9ugLpI15xJ463LyTi5mXf+BGveXeWA=="; + url = "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-4.0.0.tgz"; + sha512 = "XBmMmj8ii0KZUuJf7ZaVXDGp2+DWE02re9qn/6mV23rBpsDmpz7U1lQWRlwFQIE5q5bxIxP5pX7hDeTH0Egy9Q=="; }; }; - "remark-lint-definition-spacing-3.1.2" = { + "remark-lint-definition-spacing-4.0.0" = { name = "remark-lint-definition-spacing"; packageName = "remark-lint-definition-spacing"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-3.1.2.tgz"; - sha512 = "l058jAKfZfCOmlbIzoTll+CrZm9Bh42ZVCHcODPSZC8Yx4terCKgIoks+RWJDEdUbEw0YQoYvPc59ZVmp3BIew=="; + url = "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-4.0.0.tgz"; + sha512 = "t6nP8unz6z/DLBTWeOmDFHPFbX3E2PbNgt2fTazRbVnMC6z3o25hBzg5hI6DL0MPt2ZTRX++rJsGRjb+vgh/tQ=="; }; }; "remark-lint-double-link-0.2.0" = { @@ -47556,94 +46548,94 @@ let sha512 = "ljThEYMl7tPwvBFOYwLx3fP4jtdvvyfg1QSs6wQ2bZMdnejPMr9JpCLgAvlslJbmtIE1aU53Yq4iZ7ik1s7m6g=="; }; }; - "remark-lint-emphasis-marker-3.1.2" = { + "remark-lint-emphasis-marker-4.0.0" = { name = "remark-lint-emphasis-marker"; packageName = "remark-lint-emphasis-marker"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-3.1.2.tgz"; - sha512 = "hPZ8vxZrIfxmLA5B66bA8y3PdHjcCQuaLsySIqi5PM2DkpN6a7zAP3v1znyRSaYJ1ANVWcu00/0bNzuUjflGCA=="; + url = "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-4.0.0.tgz"; + sha512 = "xIRiB4PFWUOyIslN/UOPL6Lh+J0VD4R11+jo+W4hpGMNsg58l+2SgtdbinlXzDeoBxmaaka9n/sYpJ7cJWEIPQ=="; }; }; - "remark-lint-fenced-code-marker-3.1.2" = { + "remark-lint-fenced-code-marker-4.0.0" = { name = "remark-lint-fenced-code-marker"; packageName = "remark-lint-fenced-code-marker"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-3.1.2.tgz"; - sha512 = "6XNqjOuhT+0c7Q/22aCsMz61ne9g8HRpYF79EXQPdbzYa+PcfPXMiQKStONY3PfC8OE2/3WXI2zcs8w9x+8+VQ=="; + url = "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-4.0.0.tgz"; + sha512 = "WFN88Rx78m4/HSbW3Kx2XAYbVfzYns4bJd9qpwDD90DA3nc59zciYd01xi6Bk3n9vSs5gIlmG7xkwxVHHJ8KCA=="; }; }; - "remark-lint-file-extension-2.1.2" = { + "remark-lint-file-extension-3.0.0" = { name = "remark-lint-file-extension"; packageName = "remark-lint-file-extension"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-2.1.2.tgz"; - sha512 = "Nq54F5R7F1gyj/IMW6SvkAbVNrH+p38WK3//KCoZLDUYFrH0oXgXXFGHi9CT/O0VEopW+bWJfTn8YAJRs0qI5Q=="; + url = "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-3.0.0.tgz"; + sha512 = "wrOKiGvcl/ftB7FkeX2/l13ALvhKXV77HGR8AXo86cVY2pD+K0WdOC52DV3ldgpUXpWzE9kcgF8bbkxwzKpFFg=="; }; }; - "remark-lint-final-newline-2.1.2" = { + "remark-lint-final-newline-3.0.0" = { name = "remark-lint-final-newline"; packageName = "remark-lint-final-newline"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-2.1.2.tgz"; - sha512 = "K0FdPGPyEB94PwNgopwVJFE8oRWi7IhY2ycXFVAMReI51el7EHB8F1gX14tB6p6zyGy6mUh69bCVU9mMTNeOUg=="; + url = "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-3.0.0.tgz"; + sha512 = "NaPyn6FiOn3IV/6gIcwWfJmgraPT2IaVLjhakfPglZkKVfn/FrOfETyY8Bp+HLoSRI9967OH0yRDnK7/pPIWeQ=="; }; }; - "remark-lint-hard-break-spaces-3.1.2" = { + "remark-lint-hard-break-spaces-4.0.0" = { name = "remark-lint-hard-break-spaces"; packageName = "remark-lint-hard-break-spaces"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-3.1.2.tgz"; - sha512 = "HaW0xsl3TI7VFAqGWWcZtPqyz0NWu19KKjSO7OGFTUJU4S9YiRnhIxmSFM0ZLSsVAynE+dhzVKa8U7dOpWDcOg=="; + url = "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-4.0.0.tgz"; + sha512 = "zCTq7/xfM0ZL3bMopXse9DH2nk38wE1LrxmYwnTrqASBLnEAJWE2U2//tRGVMEBfSAnNvmIo96twz6zkLWjbGA=="; }; }; - "remark-lint-heading-style-3.1.2" = { + "remark-lint-heading-style-4.0.0" = { name = "remark-lint-heading-style"; packageName = "remark-lint-heading-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-3.1.2.tgz"; - sha512 = "0RkcRPV/H2bPFgeInzBkK1cWUwtFTm83I+Db/Z5tDY02GzKOosHLvxtJyj/1391/opAH1LYbHtHWffir99IUgw=="; + url = "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-4.0.0.tgz"; + sha512 = "dQ6Jul5K0+aNUvrq4W7H0+osSoC9hsmwHZqBFq000+eMP/hWJqI8tuudw1rap8HHYuOsKLRbB5q+Fr7G+3Vw+Q=="; }; }; - "remark-lint-link-title-style-3.1.2" = { + "remark-lint-link-title-style-4.0.0" = { name = "remark-lint-link-title-style"; packageName = "remark-lint-link-title-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-3.1.2.tgz"; - sha512 = "if4MahYJVvQUWlrXDF8GSv4b9VtLSgMSDHeikQp1/hGYlihLl9uGw3nlL5Lf9DqTN0qaT6RPbXOjuuzHlk38sg=="; + url = "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-4.0.0.tgz"; + sha512 = "cihTO5dkhjMj/evYIDAvRdQHD82OQeF4fNAq8FLb81HmFKo77VlSF6CK55H1bvlZogfJG58uN/5d1tSsOdcEbg=="; }; }; - "remark-lint-list-item-bullet-indent-4.1.2" = { + "remark-lint-list-item-bullet-indent-5.0.0" = { name = "remark-lint-list-item-bullet-indent"; packageName = "remark-lint-list-item-bullet-indent"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-4.1.2.tgz"; - sha512 = "WgU5nooqIEm6f35opcbHKBzWrdFJA3XcyTfB3nv/v0KX43/h6qFGmmMJ5kEiaFExuQp3dZSdatWuY0YZ9YRbUg=="; + url = "https://registry.npmjs.org/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-5.0.0.tgz"; + sha512 = "qq22QaxsDjfsL7aWGIPmP3P0N99CJBQQW1+iSrhYAMCDzqVlw6I3wPNAeR6s8mcoeHT8YlT6eQH3V8xJ0SlW6w=="; }; }; - "remark-lint-list-item-content-indent-3.1.2" = { + "remark-lint-list-item-content-indent-4.0.0" = { name = "remark-lint-list-item-content-indent"; packageName = "remark-lint-list-item-content-indent"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-3.1.2.tgz"; - sha512 = "TB0pmrWiRaQW80Y/PILFQTnHDghRxXNzMwyawlP+DBF9gNom3pEBmb4ZlGQlN0aa3r8VWeIKdv1ylHrfXE0vqA=="; + url = "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-4.0.0.tgz"; + sha512 = "L4GZgWQQ54qWKbnDle3dbEOtnq+qdmZJ70lpM3yMFEMHs4xejqPKsIoiYeUtIV0rYHHCWS7IlLzcgYUK9vENQw=="; }; }; - "remark-lint-list-item-indent-3.1.2" = { + "remark-lint-list-item-indent-4.0.0" = { name = "remark-lint-list-item-indent"; packageName = "remark-lint-list-item-indent"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-3.1.2.tgz"; - sha512 = "tkrra1pxZVE4OVJGfN435u/v0ljruXU+dHzWiKDYeifquD4aWhJxvSApu7+FbE098D/4usVXgMxwFkNhrpZcSQ=="; + url = "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-4.0.0.tgz"; + sha512 = "Yd6/g8CH9e4vlPAPNgl7F575uKhP+pTo/qwGkE61GOcgEVNJ/529hjumUhyQ4sOAX0YAPAjxvq6fJvb4AhVOOA=="; }; }; "remark-lint-match-punctuation-0.2.1" = { @@ -47664,22 +46656,22 @@ let sha512 = "mPIdFOGxdDhCMa2qIzjzjDzDoQeyK+/1BBgsseqThuBtoAoXR5l1TZfII2isNbBo6L8d+fMFdx1/3qALoDjtcA=="; }; }; - "remark-lint-no-blockquote-without-marker-5.1.2" = { + "remark-lint-no-blockquote-without-marker-6.0.0" = { name = "remark-lint-no-blockquote-without-marker"; packageName = "remark-lint-no-blockquote-without-marker"; - version = "5.1.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-5.1.2.tgz"; - sha512 = "QPbqsrt7EfpSWqTkZJ9tepabPIhBDlNqZkuxxMQYD0OQ2N+tHDUq3zE1JxI5ts1V9o/mWApgySocqGd3jlcKmQ=="; + url = "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-6.0.0.tgz"; + sha512 = "fBhoTpkWcl5tG4FdwPdJIyb8XLrdr6MdLk1+K2BQ6Rom3rRsIYvuox4ohxOunNrXuth8xyw8kC6wDmODR44oFw=="; }; }; - "remark-lint-no-emphasis-as-heading-3.1.2" = { + "remark-lint-no-emphasis-as-heading-4.0.0" = { name = "remark-lint-no-emphasis-as-heading"; packageName = "remark-lint-no-emphasis-as-heading"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-3.1.2.tgz"; - sha512 = "2DDx0VkqSExR6oqBiQtOsmdDwT7f3hpnPwPvBCk7BDeDU53JWY1kBAkRObkEptgH3GfpwxIQymIdHXesBpAQAg=="; + url = "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-4.0.0.tgz"; + sha512 = "JViGYbuO/xzZThK+qVTNjtLM0v1xMTWFTWt2OJzAkDaGS6T9ZB5ZtRVSBFEMG0SF3dvpJwxe+3ABTsuPBdlYsA=="; }; }; "remark-lint-no-empty-sections-4.0.0" = { @@ -47691,76 +46683,76 @@ let sha512 = "Tx1nCu7Dq3dsJ500402sSvM0uVK/6khSuEjx8K8u9aHN+Y4vjL6h88xVzdzCmZq2J2yqyFnvMjG1y7lQv+DRvg=="; }; }; - "remark-lint-no-file-name-articles-2.1.2" = { + "remark-lint-no-file-name-articles-3.0.0" = { name = "remark-lint-no-file-name-articles"; packageName = "remark-lint-no-file-name-articles"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-2.1.2.tgz"; - sha512 = "kM4vwBkne7f9euDKsuyxTtrsiafjH+KOwu8ZmuSVWh5U+u0EMcPyN5fxfaQIW+5FkrJA1jwnRu7ciXJBJt74Og=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-3.0.0.tgz"; + sha512 = "il4IseupahbV2TVfFjfDVL/EQw7jBWVlMVsv4K2cgl5uPIjiCjFGQypqKnWl6pZDN0oNOs/DE8gBdyuDjldJaA=="; }; }; - "remark-lint-no-file-name-consecutive-dashes-2.1.2" = { + "remark-lint-no-file-name-consecutive-dashes-3.0.0" = { name = "remark-lint-no-file-name-consecutive-dashes"; packageName = "remark-lint-no-file-name-consecutive-dashes"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-2.1.2.tgz"; - sha512 = "gw06jaaFwBR3s+3E2kJlv+E7rAzS7Nj+MFU7TViwbsYnR7PA96htLVDCjClyNUE7JHUNcv93HdLm8ykg8kRyNA=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-3.0.0.tgz"; + sha512 = "3vSI1LOQlu8NSCpWLsKELa8dS9HU+YVZE0U43/DNkdEcnZmlJLpTHQjBTMZUHQipRgoOO+TOSyXFyN/H+2lbuQ=="; }; }; - "remark-lint-no-file-name-irregular-characters-2.1.2" = { + "remark-lint-no-file-name-irregular-characters-3.0.0" = { name = "remark-lint-no-file-name-irregular-characters"; packageName = "remark-lint-no-file-name-irregular-characters"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-2.1.2.tgz"; - sha512 = "2tcqzLm39Jc4THNP2yvJruOz2HtV4yh+eePiySKmhfZk/6ifMyOF/wlKHKcswczSGE4InNTfxJnc/AoxOJEdkw=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-3.0.0.tgz"; + sha512 = "DhGreliHNU7lLTARQujsaLAn8fUPY0V+H0LSmOUuowBZPtIRWeNdQhunSp96RvsuYdqAdERXe0WuH58i3pRqrg=="; }; }; - "remark-lint-no-file-name-mixed-case-2.1.2" = { + "remark-lint-no-file-name-mixed-case-3.0.0" = { name = "remark-lint-no-file-name-mixed-case"; packageName = "remark-lint-no-file-name-mixed-case"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-2.1.2.tgz"; - sha512 = "0mTrjxBB4/0rV7sef+xjV5Aeb6LuW19X4QbNHW2RW7aMy+mtgJU03wdb8Y0LTnWVFHjUbc+iHrsFeCA/Pu1kew=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-3.0.0.tgz"; + sha512 = "MXXNHdGB6P46itkf8gRP0kxQL85KfAj9YOOBqNtGsgI/8J5rsyM/rz1Ac20Xe+5C5oGi71+7EO/TExKu/+7dfw=="; }; }; - "remark-lint-no-file-name-outer-dashes-2.1.2" = { + "remark-lint-no-file-name-outer-dashes-3.0.0" = { name = "remark-lint-no-file-name-outer-dashes"; packageName = "remark-lint-no-file-name-outer-dashes"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-2.1.2.tgz"; - sha512 = "VrbHg25Oo9k/bNbS7ye1X7F6ER4uZSubO+t5DHJ4WZ6iVbNtBar/JwzVelY1YxUAutv42OvHfuveh4vKlcNgVA=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-3.0.0.tgz"; + sha512 = "3kgamCp39mdlCtqF/+JLwwS4VpSj5wvVwRythUfrpW7993I9kF67dBsaU545aEzWSK+UJZqjb40i0m2VfnBRfQ=="; }; }; - "remark-lint-no-heading-content-indent-4.1.2" = { + "remark-lint-no-heading-content-indent-5.0.0" = { name = "remark-lint-no-heading-content-indent"; packageName = "remark-lint-no-heading-content-indent"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-4.1.2.tgz"; - sha512 = "TTxFsm1f4ZHFxZQCuz7j0QK4RvP6oArTiwazKLr16yaZe1608ypogMek4A30j2xX8WuO9+2uBzLXCY5OBo5x5Q=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-5.0.0.tgz"; + sha512 = "psYSlD2BjcVkgpeXOLwPcYFBrbtJWp8E8JX1J4vSfoHPeY6aIxgYxXkf57cjGTApfRL8xawBmMDiF1FgQvpZYg=="; }; }; - "remark-lint-no-heading-indent-4.1.2" = { + "remark-lint-no-heading-indent-5.0.0" = { name = "remark-lint-no-heading-indent"; packageName = "remark-lint-no-heading-indent"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-4.1.2.tgz"; - sha512 = "XFoSebfsYV6EFYRCYkCzSw6xxgltN5l3aPH+UfCk/0geMnl3DrCQjbQt9qhxQzBSBa4gA91CGs2DRI5Xxbwzig=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-5.0.0.tgz"; + sha512 = "JWGIWhaEzH00HywI0DHex92tJ5Mw7l11shQ6/MGhRjYsHMRWcwWcVeOuktVMe/BiQbg0hRoE4+g0z2VgUD6Cqw=="; }; }; - "remark-lint-no-heading-punctuation-3.1.2" = { + "remark-lint-no-heading-punctuation-4.0.0" = { name = "remark-lint-no-heading-punctuation"; packageName = "remark-lint-no-heading-punctuation"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-3.1.2.tgz"; - sha512 = "KnvHEVB/DcxJOhUvVteiovAy1+32YY5Vm0UBJqYCFrrHnN/y9ETvOJzlxFy47TaB8x2UyncSEg2JuT66UL4ONQ=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-4.0.0.tgz"; + sha512 = "7V23C3Q4yX9zEOLZdbv6o8wVxxeWB/F+h9by55zPyk2AwbqF2t2xevnAmN3XFmKZABDTqLwjQxtK6bCVv/S1PQ=="; }; }; "remark-lint-no-inline-padding-4.1.2" = { @@ -47772,13 +46764,13 @@ let sha512 = "dGyhWsiqCZS3Slob0EVBUfsFBbdpMIBCvb56LlCgaHbnLsnNYx8PpF/wA5CgsN8BXIbXfRpyPB5cIJwIq5taYg=="; }; }; - "remark-lint-no-multiple-toplevel-headings-3.1.2" = { + "remark-lint-no-multiple-toplevel-headings-4.0.0" = { name = "remark-lint-no-multiple-toplevel-headings"; packageName = "remark-lint-no-multiple-toplevel-headings"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-3.1.2.tgz"; - sha512 = "9rJSsrwdzwKmtuloBjJobLzjGL7Lgtk3+vMNUyuH9z/nBfkUCN3qxn3Nt9AxL+wwSAsHV6e74W+W2S1ohBLt6A=="; + url = "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-4.0.0.tgz"; + sha512 = "JW11iYxza7asDdhQuKfr8SH1u4NBOCQ4U7Ru0HrKCPcT4y/AB1C1il5uMQzbcervgYPBq69xzyQ24+AJeL0t3A=="; }; }; "remark-lint-no-repeat-punctuation-0.1.4" = { @@ -47790,130 +46782,130 @@ let sha512 = "JJduCs4FimdBcR1AB576SqIYOjt+7t8OjTnnlZMvjnw7lzkuL0+nNNHyNXVPaK6jxaLjEUhrH2/smU6vZFUT7g=="; }; }; - "remark-lint-no-shell-dollars-3.1.2" = { + "remark-lint-no-shell-dollars-4.0.0" = { name = "remark-lint-no-shell-dollars"; packageName = "remark-lint-no-shell-dollars"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-3.1.2.tgz"; - sha512 = "np2MDEhXHviXhbQFjnC1QYv5/fxCV1cIHfGMoJpqiW7Zcu/UGCOo5TE3XswZH4ukHZJ65c3X2A6qfLDW+ur3CQ=="; + url = "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-4.0.0.tgz"; + sha512 = "ye2h8FzjsgqqQV0HHN2g9N4FqI3eD9Gpgu7tU5ADIJyQ3mUJdwBoFn7IlGnpmumR1fb/l6u/AhRavIZxXYqG+Q=="; }; }; - "remark-lint-no-table-indentation-4.1.2" = { + "remark-lint-no-table-indentation-5.0.0" = { name = "remark-lint-no-table-indentation"; packageName = "remark-lint-no-table-indentation"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-4.1.2.tgz"; - sha512 = "5lkO+Yrtni/CDMZi7mlwbB2zzRQLH94DesboXg51aO2UfZlSn5dZNhmN5wkyCU2AiApUhlFNbxfKMHOWFPLdog=="; + url = "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-5.0.0.tgz"; + sha512 = "MaLmnzgirpnRiRjWwrsyOX0RmP2eG4YAv169MtsxTVa6O3CpUDwTuTzivudE9L0kVvTlyF9DXEmdyjm85LDyVA=="; }; }; - "remark-lint-no-undefined-references-4.2.1" = { + "remark-lint-no-undefined-references-5.0.0" = { name = "remark-lint-no-undefined-references"; packageName = "remark-lint-no-undefined-references"; - version = "4.2.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-4.2.1.tgz"; - sha512 = "HdNg5b2KiuNplcuVvRtsrUiROw557kAG1CiZYB7jQrrVWFgd86lKTa3bDiywe+87dGrGmHd3qQ28eZYTuHz2Nw=="; + url = "https://registry.npmjs.org/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-5.0.0.tgz"; + sha512 = "O0q8bHpRHK1T85oqO+uep4BkvQnZZp3y+wahDeeLLq9dCJfF56sq6Tt5OOTt1BAOZlpobS3OPQHUiJWYP6hX1w=="; }; }; - "remark-lint-no-unneeded-full-reference-image-3.1.2" = { + "remark-lint-no-unneeded-full-reference-image-4.0.0" = { name = "remark-lint-no-unneeded-full-reference-image"; packageName = "remark-lint-no-unneeded-full-reference-image"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-3.1.2.tgz"; - sha512 = "o8xIkhLaOK69Rz051KWTvjwfIE4xxx0zUyD5Mw0nt4I9/zQrpHf5+EwfjXdmQjxk116j6/0Q4FyrXB36MTPjhA=="; + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-4.0.0.tgz"; + sha512 = "0l9PZzidaAaJgn+mCRwudh6CLHvpz2PTIVlhK+fspxNwnRcPwpJOih+D4XMwyf/0x20g9MKtrlvSefIOnhqwNg=="; }; }; - "remark-lint-no-unneeded-full-reference-link-3.1.2" = { + "remark-lint-no-unneeded-full-reference-link-4.0.0" = { name = "remark-lint-no-unneeded-full-reference-link"; packageName = "remark-lint-no-unneeded-full-reference-link"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-link/-/remark-lint-no-unneeded-full-reference-link-3.1.2.tgz"; - sha512 = "iFneI8HkcPxlooXbNEmF/fmNsyVu4uOhRqQD5KsDVfJSXZSczcNm5p/SfjthfmK5copxQ0fHhcq0A1J9Iakt9A=="; + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-link/-/remark-lint-no-unneeded-full-reference-link-4.0.0.tgz"; + sha512 = "QjqhQxCvB4TNKXVaV50YCh50DzSRdpYs7hKPn9kKvkYK2tsqjnax5vz0w78fI2Nb9EY3ISoehPJDHruwAlDbew=="; }; }; - "remark-lint-no-unused-definitions-3.1.2" = { + "remark-lint-no-unused-definitions-4.0.0" = { name = "remark-lint-no-unused-definitions"; packageName = "remark-lint-no-unused-definitions"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-3.1.2.tgz"; - sha512 = "bOcaJAnjKxT3kASFquUA3fO9xem9wZhVqt8TbqjA84+G4n40qjaLXDs/4vq73aMsSde73K0f3j1u0pMe7et8yQ=="; + url = "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-4.0.0.tgz"; + sha512 = "YCZ6k575NCTx7mnN+9ls0G6YgMsZHi0LYQqfLW8MNVHBtbpTBvfmk8I39bmsvuKWeBD98weZoXSDqIiIGg+Q/g=="; }; }; - "remark-lint-ordered-list-marker-style-3.1.2" = { + "remark-lint-ordered-list-marker-style-4.0.0" = { name = "remark-lint-ordered-list-marker-style"; packageName = "remark-lint-ordered-list-marker-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-3.1.2.tgz"; - sha512 = "62iVE/YQsA0Azaqt8yAJWPplWLS47kDLjXeC2PlRIAzCqbNt9qH3HId8vZ15QTSrp8rHmJwrCMdcqV6AZUi7gQ=="; + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-4.0.0.tgz"; + sha512 = "xZ7Xppy5fzACH4b9h1b4lTzVtNY2AlUkNTfl1Oe6cIKN8tk3juFxN0wL2RpktPtSZ7iRIabzFmg6l8WPhlASJA=="; }; }; - "remark-lint-ordered-list-marker-value-3.1.2" = { + "remark-lint-ordered-list-marker-value-4.0.0" = { name = "remark-lint-ordered-list-marker-value"; packageName = "remark-lint-ordered-list-marker-value"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-3.1.2.tgz"; - sha512 = "kG08nhsFk8rhoXK5EeDN/wN28CxefraDud/MaZnji8LEyxF3HAkzFuETr9laOn8Ey+n8h/C0mpqAwUf4thyJ5g=="; + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-4.0.0.tgz"; + sha512 = "7UjNU2Nv9LGEONTU9GPmTVoNoGKD5aL1X2xHzMbSJiTc50bfcazYqZawO+qj1pQ04WPhto1qHnl0HRB5wwSVwA=="; }; }; - "remark-lint-rule-style-3.1.2" = { + "remark-lint-rule-style-4.0.0" = { name = "remark-lint-rule-style"; packageName = "remark-lint-rule-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-3.1.2.tgz"; - sha512 = "0CsX2XcX9pIhAP5N7Y8mhYXp3/Ld+NvxXY1p0LHAq0NZu17UsZLuegvx/s25uFbQs08DcmSqyKnepU9qGGqmTQ=="; + url = "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-4.0.0.tgz"; + sha512 = "Kt7IHMB5IbLgRFKaFUmB895sV3PTD0MBgN9CvXKxr1wHFF43S6tabjFIBSoQqyJRlhH0S3rK6Lvopofa009gLg=="; }; }; - "remark-lint-strong-marker-3.1.2" = { + "remark-lint-strong-marker-4.0.0" = { name = "remark-lint-strong-marker"; packageName = "remark-lint-strong-marker"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-3.1.2.tgz"; - sha512 = "U/g4wngmiI0Q6WBRQG6pZxnDS33Wt/0QYA3+KNFBDykoi1vXsDEorIqy3dEag9z6XHwcMvFDsff6VRUhaOJWQg=="; + url = "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-4.0.0.tgz"; + sha512 = "YcvuzakYhQWdCH+1E30sUY+wyvq+PNa77NZAMAYO/cS/pZczFB+q4Ccttw4Q+No/chX8oMfe0GYtm8dDWLei/g=="; }; }; - "remark-lint-table-cell-padding-4.1.3" = { + "remark-lint-table-cell-padding-5.0.0" = { name = "remark-lint-table-cell-padding"; packageName = "remark-lint-table-cell-padding"; - version = "4.1.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-4.1.3.tgz"; - sha512 = "N9xtnS6MG/H3srAMjqqaF26A7socr87pIgt64dr5rxoSbDRWRPChGQ8y7wKyV8VeyRNF37e3E5KB3bQVqjSYaQ=="; + url = "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-5.0.0.tgz"; + sha512 = "LNyiHDQZBIOqcQGG1tYsZHW7g0v8OyRmRgDrD5WEsMaAYfM6EiECUokN/Q4py9h4oM/2KUSrdZbtfuZmy87/kA=="; }; }; - "remark-lint-table-pipe-alignment-3.1.3" = { + "remark-lint-table-pipe-alignment-4.0.0" = { name = "remark-lint-table-pipe-alignment"; packageName = "remark-lint-table-pipe-alignment"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-3.1.3.tgz"; - sha512 = "bnE8WrB4kSrN+Yr+xN2GHWVgGukeSFU43qPMrpCzTyOSbzep366wORlFKqZmyFPEkIZ/uAUFS0Qm9DND66Yz/A=="; + url = "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-4.0.0.tgz"; + sha512 = "nx+xpEIWQRLOcq9hIbUIvhSE1NYRmDJmCY3cMoHJ1sIW7dRXMHyWfpWTgu7mpREKwSQdE0q4qnzk8McQQSkIcg=="; }; }; - "remark-lint-table-pipes-4.1.2" = { + "remark-lint-table-pipes-5.0.0" = { name = "remark-lint-table-pipes"; packageName = "remark-lint-table-pipes"; - version = "4.1.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-4.1.2.tgz"; - sha512 = "Ex2cJDXA0hdD9CC5Nu0p3K5LP+AhzPvk4sIOSbevCTSRyCS/SkNk4CQ6pwWBxuPVuHQUkqXkT8lgu8wwr/9A3A=="; + url = "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-5.0.0.tgz"; + sha512 = "e7jzAScDrt5+eMomh099TZJBN2K9ldDxBu9iYhNu5C0YsdAvnckJkgilsuClxFpmx4LCVYaX0EGbt/hQ3LB3xg=="; }; }; - "remark-lint-unordered-list-marker-style-3.1.2" = { + "remark-lint-unordered-list-marker-style-4.0.0" = { name = "remark-lint-unordered-list-marker-style"; packageName = "remark-lint-unordered-list-marker-style"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-3.1.2.tgz"; - sha512 = "JFiyB4ZprJGGndCaFB8FssXd48m4Kh+CUqzNgu3lBLEiW8dEAGRlD9M2AzyyA+Q29WJP/FntDCbP22DeON91UA=="; + url = "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-4.0.0.tgz"; + sha512 = "XlP4Wr4KJNovyWVv0H5axfUlF23iE9Kt2SxaVq4+ieum5YcMmKE6KsL+aqt3kiJb60SH1u6a0bxKFvdM/9riOA=="; }; }; "remark-mdx-2.0.0" = { @@ -47934,6 +46926,15 @@ let sha512 = "xKRWl1NTBOKed0oEtCd8BUfH5m4s8WXxFFSoo7uUwx6GW/qdCy4zov5LfPyw7emantDmhfWn5PdIZgcbVcWMDQ=="; }; }; + "remark-message-control-8.0.0" = { + name = "remark-message-control"; + packageName = "remark-message-control"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-8.0.0.tgz"; + sha512 = "brpzOO+jdyE/mLqvqqvbogmhGxKygjpCUCG/PwSCU43+JZQ+RM+sSzkCWBcYvgF3KIAVNIoPsvXjBkzO7EdsYQ=="; + }; + }; "remark-parse-10.0.2" = { name = "remark-parse"; packageName = "remark-parse"; @@ -48348,15 +47349,6 @@ let sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; - "resolve-2.0.0-next.5" = { - name = "resolve"; - packageName = "resolve"; - version = "2.0.0-next.5"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz"; - sha512 = "U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA=="; - }; - }; "resolve-alpn-1.2.1" = { name = "resolve-alpn"; packageName = "resolve-alpn"; @@ -48663,13 +47655,13 @@ let sha512 = "MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ=="; }; }; - "rfdc-1.3.1" = { + "rfdc-1.4.1" = { name = "rfdc"; packageName = "rfdc"; - version = "1.3.1"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz"; - sha512 = "r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg=="; + url = "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz"; + sha512 = "q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="; }; }; "right-align-0.1.3" = { @@ -48780,15 +47772,6 @@ let sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="; }; }; - "rollup-3.29.4" = { - name = "rollup"; - packageName = "rollup"; - version = "3.29.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; - sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; - }; - }; "rollup-plugin-inject-3.0.2" = { name = "rollup-plugin-inject"; packageName = "rollup-plugin-inject"; @@ -49194,13 +48177,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.77.4" = { + "sass-1.77.5" = { name = "sass"; packageName = "sass"; - version = "1.77.4"; + version = "1.77.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.4.tgz"; - sha512 = "vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz"; + sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg=="; }; }; "sass-formatter-0.7.9" = { @@ -49239,15 +48222,6 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; - "sax-1.3.0" = { - name = "sax"; - packageName = "sax"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz"; - sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; - }; - }; "sax-1.4.1" = { name = "sax"; packageName = "sax"; @@ -50112,15 +49086,6 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-1.132.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "1.132.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz"; - sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; - }; - }; "simple-git-2.21.0" = { name = "simple-git"; packageName = "simple-git"; @@ -50175,15 +49140,6 @@ let sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; - "simple-update-notifier-2.0.0" = { - name = "simple-update-notifier"; - packageName = "simple-update-notifier"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz"; - sha512 = "a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w=="; - }; - }; "simple-websocket-4.3.1" = { name = "simple-websocket"; packageName = "simple-websocket"; @@ -50715,13 +49671,13 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; - "sorcery-0.11.0" = { + "sorcery-0.11.1" = { name = "sorcery"; packageName = "sorcery"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz"; - sha512 = "J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw=="; + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.1.tgz"; + sha512 = "o7npfeJE6wi6J9l0/5LKshFzZ2rMatRiCDwYeDQaOzqdzRJwALhX7mk/A/ecg6wjMu7wdZbmXfD2S/vpOg0bdQ=="; }; }; "sort-json-2.0.1" = { @@ -50967,15 +49923,6 @@ let sha512 = "Xxiqu2wU4nkLv8G+fiv9jT6HRTrz9D8Fajli9HQtqWlrgTwQ3DSs4ZztQbhN/HsVxJX5S7ynzmJ2lQiYDQSYmg=="; }; }; - "spawn-wrap-2.0.0" = { - name = "spawn-wrap"; - packageName = "spawn-wrap"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz"; - sha512 = "EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg=="; - }; - }; "spdx-correct-3.2.0" = { name = "spdx-correct"; packageName = "spdx-correct"; @@ -51075,15 +50022,6 @@ let sha512 = "phdEoDlA6EUIVtzwq1UiNMXDUogczp204aYF/yfOhjNePWFfIpBJ1k5wLMuXQhEOOMjuTJEcc4vdZa+vuP+n/Q=="; }; }; - "speedometer-1.0.0" = { - name = "speedometer"; - packageName = "speedometer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; - sha512 = "lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw=="; - }; - }; "speedtest-net-1.6.2" = { name = "speedtest-net"; packageName = "speedtest-net"; @@ -51444,6 +50382,15 @@ let sha512 = "xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ=="; }; }; + "stdin-discarder-0.2.2" = { + name = "stdin-discarder"; + packageName = "stdin-discarder"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz"; + sha512 = "UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -51867,15 +50814,6 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.matchall-4.0.11" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz"; - sha512 = "NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg=="; - }; - }; "string.prototype.repeat-0.2.0" = { name = "string.prototype.repeat"; packageName = "string.prototype.repeat"; @@ -52110,6 +51048,15 @@ let sha512 = "dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="; }; }; + "strip-final-newline-4.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz"; + sha512 = "aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw=="; + }; + }; "strip-hex-prefix-1.0.0" = { name = "strip-hex-prefix"; packageName = "strip-hex-prefix"; @@ -52263,13 +51210,13 @@ let sha512 = "sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw=="; }; }; - "stylehacks-7.0.0" = { + "stylehacks-7.0.1" = { name = "stylehacks"; packageName = "stylehacks"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.0.tgz"; - sha512 = "47Nw4pQ6QJb4CA6dzF2m9810sjQik4dfk4UwAm5wlwhrW3syzZKF8AR4/cfO3Cr6lsFgAoznQq0Wg57qhjTA2A=="; + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.1.tgz"; + sha512 = "PnrT4HzajnxbjfChpeBKLSpSykilnGBlD+pIffCoT5KbLur9fcL8uKRQJJap85byR2wCYZl/4Otk5eq76qeZxQ=="; }; }; "stylelint-13.13.1" = { @@ -52299,15 +51246,6 @@ let sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; }; }; - "stylus-0.63.0" = { - name = "stylus"; - packageName = "stylus"; - version = "0.63.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz"; - sha512 = "OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw=="; - }; - }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -52506,22 +51444,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "svelte-4.2.17" = { + "svelte-4.2.18" = { name = "svelte"; packageName = "svelte"; - version = "4.2.17"; + version = "4.2.18"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.2.17.tgz"; - sha512 = "N7m1YnoXtRf5wya5Gyx3TWuTddI4nAyayyIWFojiWV5IayDYNV5i2mRp/7qNGol4DtxEYxljmrbgp1HM6hUbmQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.2.18.tgz"; + sha512 = "d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA=="; }; }; - "svelte-5.0.0-next.149" = { + "svelte-5.0.0-next.155" = { name = "svelte"; packageName = "svelte"; - version = "5.0.0-next.149"; + version = "5.0.0-next.155"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.149.tgz"; - sha512 = "n7CPR/7XrU7D8Wlo8kVhhEvE+aytNbBHSBfjdFm0xSDFlb5TuSNbQbKDifDGVOAFXGtVhNzl755vLLfUyBlkiA=="; + url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.155.tgz"; + sha512 = "4a4EZuiTmg4eQJuQ6LTyK+DxRAZCYm4mXgqSWcZ7TellzLfaC1Je5nxBl1aZP3xdNhvPFIstQ8c7I6d+99FdZQ=="; }; }; "svelte-preprocess-5.1.4" = { @@ -52722,32 +51660,13 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "tabtab-git+https://github.com/mixu/node-tabtab.git" = { - name = "tabtab"; - packageName = "tabtab"; - version = "0.0.2"; - src = fetchgit { - url = "https://github.com/mixu/node-tabtab.git"; - rev = "94af2b878b174527b6636aec88acd46979247755"; - sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; - }; - }; - "tailwindcss-3.3.7" = { + "tailwindcss-3.4.4" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.3.7"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.7.tgz"; - sha512 = "pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ=="; - }; - }; - "tailwindcss-3.4.3" = { - name = "tailwindcss"; - packageName = "tailwindcss"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz"; - sha512 = "U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz"; + sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A=="; }; }; "tapable-0.2.9" = { @@ -53056,13 +51975,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.31.0" = { + "terser-5.31.1" = { name = "terser"; packageName = "terser"; - version = "5.31.0"; + version = "5.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz"; - sha512 = "Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz"; + sha512 = "37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg=="; }; }; "terser-webpack-plugin-5.3.10" = { @@ -53074,15 +51993,6 @@ let sha512 = "BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w=="; }; }; - "test-exclude-6.0.0" = { - name = "test-exclude"; - packageName = "test-exclude"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"; - sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; - }; - }; "text-decoder-1.1.0" = { name = "text-decoder"; packageName = "text-decoder"; @@ -53686,15 +52596,6 @@ let sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ=="; }; }; - "touch-3.1.1" = { - name = "touch"; - packageName = "touch"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz"; - sha512 = "r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="; - }; - }; "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -53992,15 +52893,6 @@ let sha512 = "ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg=="; }; }; - "tsconfig-paths-3.15.0" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz"; - sha512 = "2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg=="; - }; - }; "tsconfig-paths-4.2.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; @@ -54028,6 +52920,15 @@ let sha512 = "wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg=="; }; }; + "tslib-2.0.3" = { + name = "tslib"; + packageName = "tslib"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"; + sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; + }; + }; "tslib-2.1.0" = { name = "tslib"; packageName = "tslib"; @@ -54073,6 +52974,15 @@ let sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; }; }; + "tslib-2.6.3" = { + name = "tslib"; + packageName = "tslib"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz"; + sha512 = "xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -54109,13 +53019,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsx-4.11.2" = { + "tsx-4.15.4" = { name = "tsx"; packageName = "tsx"; - version = "4.11.2"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/tsx/-/tsx-4.11.2.tgz"; - sha512 = "V5DL5v1BuItjsQ2FN9+4OjR7n5cr8hSgN+VGmm/fd2/0cgQdBIWHcQ3bFYm/5ZTmyxkTDBUIaRuW2divgfPe0A=="; + url = "https://registry.npmjs.org/tsx/-/tsx-4.15.4.tgz"; + sha512 = "d++FLCwJLrXaBFtRcqdPBzu6FiVOJ2j+UsvUZPtoTrnYtCGU5CEW7iHXtNZfA2fcRTvJFWPqA6SWBuB0GSva9w=="; }; }; "tty-browserify-0.0.1" = { @@ -54388,22 +53298,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.18.3" = { + "type-fest-4.20.0" = { name = "type-fest"; packageName = "type-fest"; - version = "4.18.3"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.18.3.tgz"; - sha512 = "Q08/0IrpvM+NMY9PA2rti9Jb+JejTddwmwmVQGskAlhtcrw1wsRzoR6ode6mR+OAabNa75w/dxedSUY2mlphaQ=="; - }; - }; - "type-fest-4.19.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "4.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.19.0.tgz"; - sha512 = "CN2l+hWACRiejlnr68vY0/7734Kzu+9+TOslUXbSCQ1ruY9XIHDBSceVXCcHm/oXrdzhtLMMdJEKfemf1yXiZQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz"; + sha512 = "MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw=="; }; }; "type-is-1.6.18" = { @@ -54532,15 +53433,6 @@ let sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; - "typescript-5.0.4" = { - name = "typescript"; - packageName = "typescript"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz"; - sha512 = "cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="; - }; - }; "typescript-5.3.3" = { name = "typescript"; packageName = "typescript"; @@ -54559,22 +53451,13 @@ let sha512 = "vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="; }; }; - "typescript-5.6.0-dev.20240604" = { + "typescript-5.6.0-dev.20240614" = { name = "typescript"; packageName = "typescript"; - version = "5.6.0-dev.20240604"; + version = "5.6.0-dev.20240614"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240604.tgz"; - sha512 = "uwpkMy5U51ERVvVtQmDZwjYllREGrqP35JcdR5yWIoZ7ZE2I1oDsDs3mtLiiiccyHspCZ54Z741ibuP3NbACtg=="; - }; - }; - "typescript-auto-import-cache-0.2.1" = { - name = "typescript-auto-import-cache"; - packageName = "typescript-auto-import-cache"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.2.1.tgz"; - sha512 = "FD5uYQSNkVTX4b3lvtifP+SR3bARWGmKe/uyp5BfuW2ZUCYG7vHKPddrteLU06Uh68woRaYIX+Sbs2nnySpGLw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240614.tgz"; + sha512 = "ZyRthucrT5pvqNRBtPTNixd1dnpzyf0WIK6WoTkLRIzMiI0IWM+jjI5DfNuokEx+7C8pXQDF+Zi8HPYg5ZLS+A=="; }; }; "typescript-auto-import-cache-0.3.2" = { @@ -54658,6 +53541,15 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; + "ufo-1.5.3" = { + name = "ufo"; + packageName = "ufo"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz"; + sha512 = "Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw=="; + }; + }; "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; @@ -54676,6 +53568,15 @@ let sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g=="; }; }; + "uglify-js-3.18.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; + sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -54820,15 +53721,6 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "undefsafe-2.0.5" = { - name = "undefsafe"; - packageName = "undefsafe"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz"; - sha512 = "WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="; - }; - }; "underscore-1.13.6" = { name = "underscore"; packageName = "underscore"; @@ -54919,6 +53811,15 @@ let sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; + "unenv-1.10.0-1717606461.a117952" = { + name = "unenv"; + packageName = "unenv"; + version = "1.10.0-1717606461.a117952"; + src = fetchurl { + url = "https://registry.npmjs.org/unenv-nightly/-/unenv-nightly-1.10.0-1717606461.a117952.tgz"; + sha512 = "u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg=="; + }; + }; "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; @@ -55063,6 +53964,15 @@ let sha512 = "JWudPtRN7TLFHVLEVZ+Rm8FUb6kCAtHxEXFgBGDxRSdNMnGyTU5zyYvduHSF/liExlFB3vdFvsAHnNVE/UjAwA=="; }; }; + "unified-lint-rule-3.0.0" = { + name = "unified-lint-rule"; + packageName = "unified-lint-rule"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-3.0.0.tgz"; + sha512 = "Sz96ILLsTy3djsG3H44zFb2b77MFf9CQVYnV3PWkxgRX8/n31fFrr+JnzUaJ6cbOHTtZnL1A71+YodsTjzwAew=="; + }; + }; "unified-message-control-4.0.0" = { name = "unified-message-control"; packageName = "unified-message-control"; @@ -55072,6 +53982,15 @@ let sha512 = "1b92N+VkPHftOsvXNOtkJm4wHlr+UDmTBF2dUzepn40oy9NxanJ9xS1RwUBTjXJwqr2K0kMbEyv1Krdsho7+Iw=="; }; }; + "unified-message-control-5.0.0" = { + name = "unified-message-control"; + packageName = "unified-message-control"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-5.0.0.tgz"; + sha512 = "B2cSAkpuMVVmPP90KCfKdBhm1e9KYJ+zK3x5BCa0N65zpq1Ybkc9C77+M5qwR8FWO7RF3LM5QRRPZtgjW6DUCw=="; + }; + }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -55342,6 +54261,15 @@ let sha512 = "kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg=="; }; }; + "unist-util-position-5.0.0" = { + name = "unist-util-position"; + packageName = "unist-util-position"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz"; + sha512 = "fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA=="; + }; + }; "unist-util-position-from-estree-1.1.2" = { name = "unist-util-position-from-estree"; packageName = "unist-util-position-from-estree"; @@ -55360,6 +54288,15 @@ 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"; @@ -56404,6 +55341,15 @@ let sha512 = "4+pX8UIxV1rtHpIKvzHXof5CeyMTGKMDFtuN8UmSjvJ+l5FtSen++qmSxbAc/EnkLqo5i9B2iCYTr2og77EBrA=="; }; }; + "vega-5.30.0" = { + name = "vega"; + packageName = "vega"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega/-/vega-5.30.0.tgz"; + sha512 = "ZGoC8LdfEUV0LlXIuz7hup9jxuQYhSaWek2M7r9dEHAPbPrzSQvKXZ0BbsJbrarM100TGRpTVN/l1AFxCwDkWw=="; + }; + }; "vega-canvas-1.2.7" = { name = "vega-canvas"; packageName = "vega-canvas"; @@ -56413,31 +55359,31 @@ let sha512 = "OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q=="; }; }; - "vega-crossfilter-4.1.1" = { + "vega-crossfilter-4.1.2" = { name = "vega-crossfilter"; packageName = "vega-crossfilter"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.1.tgz"; - sha512 = "yesvlMcwRwxrtAd9IYjuxWJJuAMI0sl7JvAFfYtuDkkGDtqfLXUcCzHIATqW6igVIE7tWwGxnbfvQLhLNgK44Q=="; + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.2.tgz"; + sha512 = "J7KVEXkpfRJBfRvwLxn5vNCzQCNkrnzmDvkvwhuiwT4gPm5sk7MK5TuUP8GCl/iKYw+kWeVXEtrVHwWtug+bcQ=="; }; }; - "vega-dataflow-5.7.5" = { + "vega-dataflow-5.7.6" = { name = "vega-dataflow"; packageName = "vega-dataflow"; - version = "5.7.5"; + version = "5.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.5.tgz"; - sha512 = "EdsIl6gouH67+8B0f22Owr2tKDiMPNNR8lEvJDcxmFw02nXd8juimclpLvjPQriqn6ta+3Dn5txqfD117H04YA=="; + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.6.tgz"; + sha512 = "9Md8+5iUC1MVKPKDyZ7pCEHk6I9am+DgaMzZqo/27O/KI4f23/WQXPyuI8jbNmc/mkm340P0TKREmzL5M7+2Dg=="; }; }; - "vega-encode-4.10.0" = { + "vega-encode-4.10.1" = { name = "vega-encode"; packageName = "vega-encode"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.10.0.tgz"; - sha512 = "TTWIXVWHLGMkPEUC1bLkQKZdKnHUTGcjO2JST3jxHFgnGtN/HOovjaeOm2mkOoxrHJgQERyKorpGprOttuY6Kg=="; + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.10.1.tgz"; + sha512 = "d25nVKZDrg109rC65M8uxE+7iUrTxktaqgK4fU3XZBgpWlh1K4UbU5nDag7kiHVVN4tKqwgd+synEotra9TiVQ=="; }; }; "vega-event-selector-3.0.1" = { @@ -56449,31 +55395,31 @@ let sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A=="; }; }; - "vega-expression-5.1.0" = { + "vega-expression-5.1.1" = { name = "vega-expression"; packageName = "vega-expression"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.0.tgz"; - sha512 = "u8Rzja/cn2PEUkhQN3zUj3REwNewTA92ExrcASNKUJPCciMkHJEjESwFYuI6DWMCq4hQElQ92iosOAtwzsSTqA=="; + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.1.tgz"; + sha512 = "zv9L1Hm0KHE9M7mldHyz8sXbGu3KmC0Cdk7qfHkcTNS75Jpsem6jkbu6ZAwx5cNUeW91AxUQOu77r4mygq2wUQ=="; }; }; - "vega-force-4.2.0" = { + "vega-force-4.2.1" = { name = "vega-force"; packageName = "vega-force"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-force/-/vega-force-4.2.0.tgz"; - sha512 = "aE2TlP264HXM1r3fl58AvZdKUWBNOGkIvn4EWyqeJdgO2vz46zSU7x7TzPG4ZLuo44cDRU5Ng3I1eQk23Asz6A=="; + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.2.1.tgz"; + sha512 = "2BcuuqFr77vcCyKfcpedNFeYMxi+XEFCrlgLWNx7YV0PI8pdP5y/yPkzyuE9Tb894+KkRAvfQHZRAshcnFNcMw=="; }; }; - "vega-format-1.1.1" = { + "vega-format-1.1.2" = { name = "vega-format"; packageName = "vega-format"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.1.tgz"; - sha512 = "Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ=="; + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.2.tgz"; + sha512 = "0kUfAj0dg0U6GcEY0Kp6LiSTCZ8l8jl1qVdQyToMyKmtZg/q56qsiJQZy3WWRr1MtWkTIZL71xSJXgjwjeUaAw=="; }; }; "vega-functions-5.14.0" = { @@ -56485,22 +55431,31 @@ let sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg=="; }; }; - "vega-geo-4.4.1" = { - name = "vega-geo"; - packageName = "vega-geo"; - version = "4.4.1"; + "vega-functions-5.15.0" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.1.tgz"; - sha512 = "s4WeZAL5M3ZUV27/eqSD3v0FyJz3PlP31XNSLFy4AJXHxHUeXT3qLiDHoVQnW5Om+uBCPDtTT1ROx1smGIf2aA=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.15.0.tgz"; + sha512 = "pCqmm5efd+3M65jrJGxEy3UGuRksmK6DnWijoSNocnxdCBxez+yqUUVX9o2pN8VxMe3648vZnR9/Vk5CXqRvIQ=="; }; }; - "vega-hierarchy-4.1.1" = { + "vega-geo-4.4.2" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.2.tgz"; + sha512 = "unuV/UxUHf6UJu6GYxMZonC3SZlMfFXYLOkgEsRSvmsMPt3+CVv8FmG88dXNRUJUrdROrJepgecqx0jOwMSnGA=="; + }; + }; + "vega-hierarchy-4.1.2" = { name = "vega-hierarchy"; packageName = "vega-hierarchy"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.1.tgz"; - sha512 = "h5mbrDtPKHBBQ9TYbvEb/bCqmGTlUX97+4CENkyH21tJs7naza319B15KRK0NWOHuhbGhFmF8T0696tg+2c8XQ=="; + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.2.tgz"; + sha512 = "m+xDtT5092YPSnV0rdTLW+AWmoCb+A54JQ66MUJwiDBpKxvfKnTiQeuiWDU2YudjUoXZN9EBOcI6QHF8H2Lu2A=="; }; }; "vega-label-1.2.1" = { @@ -56512,13 +55467,22 @@ let sha512 = "n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg=="; }; }; - "vega-loader-4.5.1" = { + "vega-label-1.3.0" = { + name = "vega-label"; + packageName = "vega-label"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-label/-/vega-label-1.3.0.tgz"; + sha512 = "EfSFSCWAwVPsklM5g0gUEuohALgryuGC/SKMmsOH7dYT/bywmLBZhLVbrE+IHJAUauoGrMhYw1mqnXL/0giJBg=="; + }; + }; + "vega-loader-4.5.2" = { name = "vega-loader"; packageName = "vega-loader"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.1.tgz"; - sha512 = "qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA=="; + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.2.tgz"; + sha512 = "ktIdGz3DRIS3XfTP9lJ6oMT5cKwC86nQkjUbXZbOtwXQFVNE2xVWBuH13GP6FKUZxg5hJCMtb5v/e/fwTvhKsQ=="; }; }; "vega-parser-6.3.0" = { @@ -56530,13 +55494,22 @@ let sha512 = "swS5RuP2imRarMpGWaAZusoKkXc4Z5WxWx349pkqxIAf4F7H8Ya9nThEkSWsFozd75O9nWh0QLifds8Xb7KjUg=="; }; }; - "vega-projection-1.6.0" = { + "vega-parser-6.4.0" = { + name = "vega-parser"; + packageName = "vega-parser"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.4.0.tgz"; + sha512 = "/hFIJs0yITxfvLIfhhcpUrcbKvu4UZYoMGmly5PSsbgo60oAsVQW8ZbX2Ji3iNFqZJh1ifoX/P0j+9wep1OISw=="; + }; + }; + "vega-projection-1.6.1" = { name = "vega-projection"; packageName = "vega-projection"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.0.tgz"; - sha512 = "LGUaO/kpOEYuTlul+x+lBzyuL9qmMwP1yShdUWYLW+zXoeyGbs5OZW+NbPPwLYqJr5lpXDr/vGztFuA/6g2xvQ=="; + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.1.tgz"; + sha512 = "sqfnAAHumU7MWU1tQN3b6HNgKGF3legek0uLHhjLKcDJQxEc7kwcD18txFz2ffQks6d5j+AUhBiq4GARWf0DEQ=="; }; }; "vega-regression-1.2.0" = { @@ -56548,6 +55521,15 @@ let sha512 = "6TZoPlhV/280VbxACjRKqlE0Nv48z5g4CSNf1FmGGTWS1rQtElPTranSoVW4d7ET5eVQ6f9QLxNAiALptvEq+g=="; }; }; + "vega-regression-1.3.0" = { + name = "vega-regression"; + packageName = "vega-regression"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.3.0.tgz"; + sha512 = "gxOQfmV7Ft/MYKpXDEo09WZyBuKOBqxqDRWay9KtfGq/E0Y4vbTPsWLv2cB1ToPJdKE6XSN6Re9tCIw5M/yMUg=="; + }; + }; "vega-runtime-6.1.4" = { name = "vega-runtime"; packageName = "vega-runtime"; @@ -56557,13 +55539,22 @@ let sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; }; }; - "vega-scale-7.4.0" = { + "vega-runtime-6.2.0" = { + name = "vega-runtime"; + packageName = "vega-runtime"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.2.0.tgz"; + sha512 = "30UXbujWjKNd5aeP+oeHuwFmzuyVYlBj4aDy9+AjfWLECu8wJt4K01vwegcaGPdCWcPLVIv4Oa9Lob4mcXn5KQ=="; + }; + }; + "vega-scale-7.4.1" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.4.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.4.0.tgz"; - sha512 = "+GxjtToQiR2OqnlvRsnVTaX/HGLG9EPiFWkIwSG5ZCLSAxm0CRiqAQvvRmj0HEeIw8F92aGRX4rSoM8qyGAK5A=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.4.1.tgz"; + sha512 = "dArA28DbV/M92O2QvswnzCmQ4bq9WwLKUoyhqFYWCltmDwkmvX7yhqiFLFMWPItIm7mi4Qyoygby6r4DKd1X2A=="; }; }; "vega-scenegraph-4.12.0" = { @@ -56575,6 +55566,15 @@ let sha512 = "l0Us6TLRV7AAd1CxB6mvxXt9/psknqgrr0+6d1zNWtHL8tGszPE4FqllZC5m4ZtUouvE4PWKGybd5uJR0dpchw=="; }; }; + "vega-scenegraph-4.13.0" = { + name = "vega-scenegraph"; + packageName = "vega-scenegraph"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.13.0.tgz"; + sha512 = "nfl45XtuqB5CxyIZJ+bbJ+dofzosPCRlmF+eUQo+0J23NkNXsTzur+1krJDSdhcw0SOYs4sbYRoMz1cpuOM4+Q=="; + }; + }; "vega-selections-5.4.2" = { name = "vega-selections"; packageName = "vega-selections"; @@ -56593,13 +55593,13 @@ let sha512 = "GAqS7mkatpXcMCQKWtFu1eMUKLUymjInU0O8kXshWaQrVWjPIO2lllZ1VNhdgE0qGj4oOIRRS11kzuijLshGXQ=="; }; }; - "vega-time-2.1.1" = { + "vega-time-2.1.2" = { name = "vega-time"; packageName = "vega-time"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.1.tgz"; - sha512 = "z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA=="; + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.2.tgz"; + sha512 = "6rXc6JdDt8MnCRy6UzUCsa6EeFycPDmvioMddLfKw38OYCV8pRQC5nw44gyddOwXgUTJLiCtn/sp53P0iA542A=="; }; }; "vega-transforms-4.11.1" = { @@ -56611,6 +55611,15 @@ let sha512 = "DDbqEQnvy9/qEvv0bAKPqAuzgaNb7Lh2xKJFom2Yzx4tZHCl8dnKxC1lH9JnJlAMdtZuiNLPARUkf3pCNQ/olw=="; }; }; + "vega-transforms-4.12.0" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.12.0.tgz"; + sha512 = "bh/2Qbj85O70mjfLRgPKAsABArgSUP0k+GjmaY54zukIRxoGxKju+85nigeX/aR/INpEqNWif+5lL+NvmyWA5w=="; + }; + }; "vega-typings-1.1.0" = { name = "vega-typings"; packageName = "vega-typings"; @@ -56620,6 +55629,15 @@ let sha512 = "uI6RWlMiGRhsgmw/LzJtjCc0kwhw2f0JpyNMTAnOy90kE4e4CiaZN5nJp8S9CcfcBoPEZHc166AOn2SSNrKn3A=="; }; }; + "vega-typings-1.3.1" = { + name = "vega-typings"; + packageName = "vega-typings"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.3.1.tgz"; + sha512 = "j9Sdgmvowz09jkMgTFGVfiv7ycuRP/TQkdHRPXIYwt3RDgPQn7inyFcJ8C8ABFt4MiMWdjOwbneF6KWW8TRXIw=="; + }; + }; "vega-util-1.17.2" = { name = "vega-util"; packageName = "vega-util"; @@ -56638,6 +55656,15 @@ let sha512 = "9TdF35FTZNzfvfj+YM38vHOgfeGxMy2xMY+2B46ZHoustt3J/mxtfueu3RGFsGIitUGhFrmLeEHxlVHP/tY+sQ=="; }; }; + "vega-view-5.13.0" = { + name = "vega-view"; + packageName = "vega-view"; + version = "5.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.13.0.tgz"; + sha512 = "ZPAAQ3iYz6YrQjJoDT+0bcxJkXt9PKF5v4OO7Omw8PFhkIv++jFXeKlQTW1bBtyQ92dkdGGHv5lYY67Djqjf3A=="; + }; + }; "vega-view-transforms-4.5.9" = { name = "vega-view-transforms"; packageName = "vega-view-transforms"; @@ -56647,22 +55674,31 @@ let sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; }; }; - "vega-voronoi-4.2.2" = { - name = "vega-voronoi"; - packageName = "vega-voronoi"; - version = "4.2.2"; + "vega-view-transforms-4.6.0" = { + name = "vega-view-transforms"; + packageName = "vega-view-transforms"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.2.tgz"; - sha512 = "Bq2YOp2MGphhQnUuLwl3dsyBs6MuEU86muTjDbBJg33+HkZtE1kIoQZr+EUHa46NBsY1NzSKddOTu8wcaFrWiQ=="; + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.6.0.tgz"; + sha512 = "z3z66aJTA3ZRo4oBY4iBXnn+A4KqBGZT/UrlKDbm+7Ec+Ip+hK2tF8Kmhp/WNcMsDZoUWFqLJgR2VgOgvJk9RA=="; }; }; - "vega-wordcloud-4.1.4" = { + "vega-voronoi-4.2.3" = { + name = "vega-voronoi"; + packageName = "vega-voronoi"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.3.tgz"; + sha512 = "aYYYM+3UGqwsOx+TkVtF1IZfguy0H7AN79dR8H0nONRIc+vhk/lbnlkgwY2nSzEu0EZ4b5wZxeGoDBEVmdDEcg=="; + }; + }; + "vega-wordcloud-4.1.5" = { name = "vega-wordcloud"; packageName = "vega-wordcloud"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.4.tgz"; - sha512 = "oeZLlnjiusLAU5vhk0IIdT5QEiJE0x6cYoGNq1th+EbwgQp153t4r026fcib9oq15glHFOzf81a8hHXHSJm1Jw=="; + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.5.tgz"; + sha512 = "p+qXU3cb9VeWzJ/HEdax0TX2mqDJcSbrCIfo2d/EalOXGkvfSLKobsmMQ8DxPbtVp0uhnpvfCGDyMJw+AzcI2A=="; }; }; "verror-1.1.0" = { @@ -56755,6 +55791,15 @@ let sha512 = "YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw=="; }; }; + "vfile-location-5.0.2" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz"; + sha512 = "NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg=="; + }; + }; "vfile-message-2.0.4" = { name = "vfile-message"; packageName = "vfile-message"; @@ -56899,24 +55944,6 @@ let sha512 = "BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q=="; }; }; - "vite-4.4.12" = { - name = "vite"; - packageName = "vite"; - version = "4.4.12"; - src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.4.12.tgz"; - sha512 = "KtPlUbWfxzGVul8Nut8Gw2Qe8sBzWY+8QVc5SL8iRFnpnrcoCaNlzO40c1R6hPmcdTwIPEDkq0Y9+27a5tVbdQ=="; - }; - }; - "vite-code-inspector-plugin-0.1.9" = { - name = "vite-code-inspector-plugin"; - packageName = "vite-code-inspector-plugin"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/vite-code-inspector-plugin/-/vite-code-inspector-plugin-0.1.9.tgz"; - sha512 = "49ZLkFS2ajDCZ0eXTKK0BG4G2yLMtXHjQUZ5ebx889sZm0O3qJzjhtzTITjOi37xjYFASWuIptqL98qEgYXhoA=="; - }; - }; "vlc-command-1.2.0" = { name = "vlc-command"; packageName = "vlc-command"; @@ -57079,15 +56106,6 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.3.11" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "5.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.11.tgz"; - sha512 = "WYS72Ymria3dn8ZbjtBbt5K71m05wY1Q6hpXV5JxUT0q75Ts0ljLmnZJAVpx8DjPgYbFD+Z8KHpWh2laKLUCtQ=="; - }; - }; "vscode-jsonrpc-3.5.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -57214,15 +56232,6 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; - "vscode-languageserver-6.1.1" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; - }; - }; "vscode-languageserver-6.2.0-next.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -57556,24 +56565,6 @@ let sha512 = "DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A=="; }; }; - "vue-component-meta-1.6.5" = { - name = "vue-component-meta"; - packageName = "vue-component-meta"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-component-meta/-/vue-component-meta-1.6.5.tgz"; - sha512 = "pps5DTFz9JiqidXMrPCf/Qt8sngQYzkU73CB4zLh5dsPlAMSm742+/zOR4MgKxuaZSPAwDFazSRhRCkpkywmCw=="; - }; - }; - "vue-component-type-helpers-1.6.5" = { - name = "vue-component-type-helpers"; - packageName = "vue-component-type-helpers"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-1.6.5.tgz"; - sha512 = "iGdlqtajmiqed8ptURKPJ/Olz0/mwripVZszg6tygfZSIL9kYFPJTNY6+Q6OjWGznl2L06vxG5HvNvAnWrnzbg=="; - }; - }; "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -57592,15 +56583,6 @@ let sha512 = "2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg=="; }; }; - "vue-template-compiler-2.7.16" = { - name = "vue-template-compiler"; - packageName = "vue-template-compiler"; - version = "2.7.16"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz"; - sha512 = "AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ=="; - }; - }; "w3c-hr-time-1.0.2" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -57853,13 +56835,13 @@ let sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; }; - "webpack-5.91.0" = { + "webpack-5.92.0" = { name = "webpack"; packageName = "webpack"; - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz"; - sha512 = "rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz"; + sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA=="; }; }; "webpack-cli-5.1.4" = { @@ -57871,15 +56853,6 @@ let sha512 = "pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg=="; }; }; - "webpack-code-inspector-plugin-0.1.9" = { - name = "webpack-code-inspector-plugin"; - packageName = "webpack-code-inspector-plugin"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-code-inspector-plugin/-/webpack-code-inspector-plugin-0.1.9.tgz"; - sha512 = "w4/dvbCVeuhmmY2TnnHSjo7SWXfYicNdjdGU7CixZy8rxyXBSMCdlArSFgxJ/DWctLMWJ5whxIcMNm7twIPi6A=="; - }; - }; "webpack-dev-middleware-5.3.4" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -57970,13 +56943,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-2.3.6" = { + "webtorrent-2.4.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "2.3.6"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.3.6.tgz"; - sha512 = "JH+jXz+zR6erd9mLGb+HV18B+6EsdY+Jseg7G+asilGSLhP2VfOxa5spFJ3rF22j+LOQo+U8vuFk9S9XvPQJGg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.1.tgz"; + sha512 = "9/WTMFaAAbfopNQiGK5rD7ZJJTdPwOrl/T6izTWVEk56+cJdtZBz9FelMnwnS4Q7rqFKoEYuonzi+ig0nXjYsA=="; }; }; "whatwg-encoding-1.0.5" = { @@ -57997,15 +56970,6 @@ let sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; }; }; - "whatwg-fetch-3.6.20" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.20"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz"; - sha512 = "EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="; - }; - }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -58123,15 +57087,6 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; - "which-builtin-type-1.1.3" = { - name = "which-builtin-type"; - packageName = "which-builtin-type"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz"; - sha512 = "YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw=="; - }; - }; "which-collection-1.0.2" = { name = "which-collection"; packageName = "which-collection"; @@ -58447,13 +57402,13 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20240524.0" = { + "workerd-1.20240610.1" = { name = "workerd"; packageName = "workerd"; - version = "1.20240524.0"; + version = "1.20240610.1"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20240524.0.tgz"; - sha512 = "LWLe5D8PVHBcqturmBbwgI71r7YPpIMYZoVEH6S4G35EqIJ55cb0n3FipoSyraoIfpcCxCFxX1K6WsRHbP3pFA=="; + url = "https://registry.npmjs.org/workerd/-/workerd-1.20240610.1.tgz"; + sha512 = "Rtut5GrsODQMh6YU43b9WZ980Wd05Ov1/ds88pT/SoetmXFBvkBzdRfiHiATv+azmGX8KveE0i/Eqzk/yI01ug=="; }; }; "workerpool-6.2.1" = { @@ -59177,13 +58132,13 @@ let sha512 = "pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg=="; }; }; - "yaml-2.4.3" = { + "yaml-2.4.5" = { name = "yaml"; packageName = "yaml"; - version = "2.4.3"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.4.3.tgz"; - sha512 = "sntgmxj8o7DE7g/Qi60cqpLBA3HG3STcDA0kO+WfB05jEKhZMbY7umNm2rBpQvsmZ16/lPXCJGW2672dgOUkrg=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz"; + sha512 = "aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg=="; }; }; "yaml-front-matter-4.1.1" = { @@ -59483,6 +58438,15 @@ let sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; }; }; + "yoctocolors-2.0.2" = { + name = "yoctocolors"; + packageName = "yoctocolors"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.0.2.tgz"; + sha512 = "Ct97huExsu7cWeEjmrXlofevF8CvzUglJ4iGUet5B8xn1oumtAZBpHU4GzYuoE6PVqcZ5hghtBrSlhwHuR1Jmw=="; + }; + }; "yoga-layout-prebuilt-1.10.0" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; @@ -59597,15 +58561,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "18.0.2"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-18.0.2.tgz"; - sha512 = "shrxMD1bcWWh7WpBN3KTV+Lt8E62gURSUFhs6kdGLepMDif8LPAv45+hpt8SBU9VfQuL6AHa4cW8uDL9BKGlYA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-18.0.4.tgz"; + sha512 = "i7DLVIc4HN0CFZZKbEeVeQSADRG1Dt2CwXh/wTUzglRLu/tE7Q+WMrqJ2+lGTT2edZp2KKysM4Gxp+ATAzP8AQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1800.2" - sources."@angular-devkit/core-18.0.2" - sources."@angular-devkit/schematics-18.0.2" + sources."@angular-devkit/architect-0.1800.4" + sources."@angular-devkit/core-18.0.4" + sources."@angular-devkit/schematics-18.0.4" sources."@inquirer/figures-1.0.3" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ @@ -59636,14 +58600,14 @@ in sources."which-4.0.0" ]; }) - sources."@npmcli/redact-2.0.0" + sources."@npmcli/redact-2.0.1" (sources."@npmcli/run-script-8.1.0" // { dependencies = [ sources."isexe-3.1.1" sources."which-4.0.0" ]; }) - sources."@schematics/angular-18.0.2" + sources."@schematics/angular-18.0.4" sources."@sigstore/bundle-2.3.2" sources."@sigstore/core-1.1.0" sources."@sigstore/protobuf-specs-0.3.2" @@ -59703,7 +58667,7 @@ in sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fill-range-7.1.1" - (sources."foreground-child-3.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -59749,7 +58713,7 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."jsbn-1.1.0" sources."json-parse-even-better-errors-3.0.2" sources."json-schema-traverse-1.0.0" @@ -59770,11 +58734,6 @@ in sources."minipass-3.3.6" ]; }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) (sources."minipass-pipeline-1.2.4" // { dependencies = [ sources."minipass-3.3.6" @@ -59810,7 +58769,7 @@ in sources."npm-package-arg-11.0.2" sources."npm-packlist-8.0.2" sources."npm-pick-manifest-9.0.1" - sources."npm-registry-fetch-17.0.1" + sources."npm-registry-fetch-17.1.0" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -59875,7 +58834,7 @@ in }) sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tuf-js-2.2.1" sources."type-fest-0.21.3" sources."unique-filename-3.0.0" @@ -59970,7 +58929,7 @@ in sources."muggle-string-0.4.1" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" - sources."prettier-3.3.0" + sources."prettier-3.3.2" (sources."prettier-plugin-astro-0.14.0" // { dependencies = [ sources."@astrojs/compiler-1.8.2" @@ -60030,42 +58989,42 @@ in "@babel/cli" = nodeEnv.buildNodePackage { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.6.tgz"; - sha512 = "Sm/YhG/0REw9SKByFHDf4hkk7PYsjcsOyZgHGz1nvab4tUTQ9N4XVv+ykK0Y+VCJ3OshA/7EDyxnwCd8NEP/mQ=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz"; + sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/generator-7.24.7" + (sources."@babel/helper-compilation-targets-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + 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.7" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -60074,8 +59033,8 @@ in sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.23.0" - sources."caniuse-lite-1.0.30001627" + sources."browserslist-4.23.1" + sources."caniuse-lite-1.0.30001634" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -60083,7 +59042,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.5" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -60133,9 +59092,9 @@ in sha512 = "LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -60156,9 +59115,9 @@ in sources."@commitlint/top-level-19.0.0" sources."@commitlint/types-19.0.3" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."JSONStream-1.3.5" - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" @@ -60183,7 +59142,6 @@ in sources."escape-string-regexp-1.0.5" sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" - sources."fast-uri-2.3.0" sources."find-up-7.0.0" sources."get-caller-file-2.0.5" sources."get-stream-8.0.1" @@ -60204,7 +59162,7 @@ in sources."is-stream-3.0.0" sources."is-text-path-2.0.0" sources."isexe-2.0.0" - sources."jiti-1.21.0" + sources."jiti-1.21.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" @@ -60238,6 +59196,7 @@ in sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."picocolors-1.0.1" + sources."punycode-2.3.1" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" @@ -60255,6 +59214,7 @@ in sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."unicorn-magic-0.1.0" + sources."uri-js-4.4.1" sources."which-2.0.2" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -60289,7 +59249,7 @@ in dependencies = [ sources."@commitlint/types-19.0.3" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."array-ify-1.0.0" sources."chalk-5.3.0" sources."compare-func-2.0.0" @@ -60311,45 +59271,45 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.127.0"; + version = "5.128.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.127.0.tgz"; - sha512 = "KvCxspLAeVAlFA2qomPhyK1RwqEtxYLSICRWiZRWCRZSJ7rZCYkeGDxSWZVONyZYkI51MoOU2lXwTMal+kPxbg=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.128.1.tgz"; + sha512 = "Im/WUAT2Oqxvy92VqVZ+SoBsdffm0F7Luy5dJX853NFrj0W6VzspcR8T5yKKYHzh4fk4YNRKBVa7Mz3VhUJ0ow=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-auth-1.7.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-client-1.9.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (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.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-lro-2.7.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-paging-1.6.2" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-rest-pipeline-1.16.0" // { @@ -60357,63 +59317,63 @@ in sources."@azure/abort-controller-2.1.2" sources."agent-base-7.1.1" sources."https-proxy-agent-7.0.4" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-tracing-1.1.2" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/core-util-1.9.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/identity-4.0.1" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) (sources."@azure/logger-1.1.2" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) - sources."@azure/msal-browser-3.16.0" - sources."@azure/msal-common-14.11.0" - sources."@azure/msal-node-2.9.1" + sources."@azure/msal-browser-3.17.0" + sources."@azure/msal-common-14.12.0" + sources."@azure/msal-node-2.9.2" (sources."@azure/storage-blob-12.17.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) - sources."@babel/code-frame-7.24.6" - sources."@babel/generator-7.24.6" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/generator-7.24.7" + 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/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" 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.4.15" sources."@jridgewell/trace-mapping-0.3.25" - sources."@microsoft/rush-lib-5.127.0" + sources."@microsoft/rush-lib-5.128.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.8.0" + sources."@opentelemetry/api-1.9.0" sources."@pnpm/crypto.base32-hash-2.0.0" sources."@pnpm/dependency-path-2.1.8" sources."@pnpm/error-1.4.0" @@ -60452,7 +59412,7 @@ in ]; }) sources."@rushstack/package-deps-hash-4.1.57" - (sources."@rushstack/package-extractor-0.7.15" // { + (sources."@rushstack/package-extractor-0.7.16" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" @@ -60463,10 +59423,10 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.127.0" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.127.0" - sources."@rushstack/rush-http-build-cache-plugin-5.127.0" - sources."@rushstack/rush-sdk-5.127.0" + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.128.1" + sources."@rushstack/rush-http-build-cache-plugin-5.128.1" + sources."@rushstack/rush-sdk-5.128.1" sources."@rushstack/stream-collator-4.1.56" (sources."@rushstack/terminal-0.13.0" // { dependencies = [ @@ -60482,19 +59442,19 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.17.4" + sources."@types/lodash-4.17.5" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.5" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" 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.27" - sources."@vue/compiler-dom-3.4.27" - sources."@vue/compiler-sfc-3.4.27" - sources."@vue/compiler-ssr-3.4.27" - sources."@vue/shared-3.4.27" + sources."@vue/compiler-core-3.4.29" + sources."@vue/compiler-dom-3.4.29" + sources."@vue/compiler-sfc-3.4.29" + sources."@vue/compiler-ssr-3.4.29" + sources."@vue/shared-3.4.29" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -60767,6 +59727,7 @@ in sources."jsonpath-plus-4.0.0" (sources."jsonwebtoken-9.0.2" // { dependencies = [ + sources."jwa-1.4.1" sources."jws-3.2.2" ]; }) @@ -60777,12 +59738,8 @@ in sources."string_decoder-1.1.1" ]; }) - sources."jwa-1.4.1" - (sources."jws-4.0.0" // { - dependencies = [ - sources."jwa-2.0.0" - ]; - }) + sources."jwa-2.0.0" + sources."jws-4.0.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -61136,10 +60093,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.61.0"; + version = "3.61.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.61.0.tgz"; - sha512 = "rECZkNNYbjNukWUP3F+rlhVz2XVSExEbkoO5S+u1jWIKoi7f6+0GEXEecYzUzU1euhknMKAFbHQ7ecQiteMHuA=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.61.2.tgz"; + sha512 = "XVG6IyNBJTL8YN6qGzRKapkOijI2mTVeDB2zTg/BnQsmDV57XH5ciGfDWSSN39banCZg7jwU+FssIXgmDl5ERg=="; }; dependencies = [ sources."@ast-grep/napi-0.11.0" @@ -61230,18 +60187,18 @@ in 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -61275,7 +60232,7 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."function-bind-1.1.2" sources."glob-10.4.1" sources."glob-parent-6.0.2" @@ -61287,8 +60244,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" - sources."jiti-1.21.0" + sources."jackspeak-3.4.0" + sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lru-cache-10.2.2" @@ -61314,7 +60271,7 @@ in sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" ]; }) sources."postcss-nested-6.0.1" @@ -61345,7 +60302,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.3" + sources."tailwindcss-3.4.4" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -61355,7 +60312,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" @@ -61370,7 +60327,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -61407,18 +60364,18 @@ in 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -61452,7 +60409,7 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."function-bind-1.1.2" sources."glob-10.4.1" sources."glob-parent-6.0.2" @@ -61464,8 +60421,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" - sources."jiti-1.21.0" + sources."jackspeak-3.4.0" + sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lru-cache-10.2.2" @@ -61492,7 +60449,7 @@ in sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" ]; }) sources."postcss-nested-6.0.1" @@ -61523,7 +60480,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.3" + sources."tailwindcss-3.4.4" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -61533,7 +60490,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" @@ -61548,7 +60505,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -61585,18 +60542,18 @@ in 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -61630,7 +60587,7 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."function-bind-1.1.2" sources."glob-10.4.1" sources."glob-parent-6.0.2" @@ -61642,8 +60599,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" - sources."jiti-1.21.0" + sources."jackspeak-3.4.0" + sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lru-cache-10.2.2" @@ -61669,7 +60626,7 @@ in sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" ]; }) sources."postcss-nested-6.0.1" @@ -61700,7 +60657,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.3" + sources."tailwindcss-3.4.4" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -61710,7 +60667,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" @@ -61725,7 +60682,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -61762,18 +60719,18 @@ in 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -61807,7 +60764,7 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."function-bind-1.1.2" sources."glob-10.4.1" sources."glob-parent-6.0.2" @@ -61819,8 +60776,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" - sources."jiti-1.21.0" + sources."jackspeak-3.4.0" + sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lodash.castarray-4.4.0" @@ -61849,7 +60806,7 @@ in sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" ]; }) (sources."postcss-nested-6.0.1" // { @@ -61884,7 +60841,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.4.3" // { + (sources."tailwindcss-3.4.4" // { dependencies = [ sources."postcss-selector-parser-6.1.0" ]; @@ -61898,7 +60855,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" @@ -61913,7 +60870,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -61935,88 +60892,71 @@ in sha512 = "FTg+WumdND6cgcRMdWhYKIPQ+00k21aIrbCFGQbDH79kWgRlHVDAur+ryVh+zT5YeM8u475tddn02nmJ2QqIow=="; }; dependencies = [ - (sources."@aws-crypto/crc32-3.0.0" // { + sources."@aws-crypto/crc32-5.2.0" + sources."@aws-crypto/crc32c-5.2.0" + (sources."@aws-crypto/sha1-browser-5.2.0" // { dependencies = [ - sources."tslib-1.14.1" + sources."@smithy/util-utf8-2.3.0" ]; }) - (sources."@aws-crypto/crc32c-3.0.0" // { + (sources."@aws-crypto/sha256-browser-5.2.0" // { dependencies = [ - sources."tslib-1.14.1" + sources."@smithy/util-utf8-2.3.0" ]; }) - (sources."@aws-crypto/ie11-detection-3.0.0" // { + sources."@aws-crypto/sha256-js-5.2.0" + sources."@aws-crypto/supports-web-crypto-5.2.0" + (sources."@aws-crypto/util-5.2.0" // { dependencies = [ - sources."tslib-1.14.1" + sources."@smithy/util-utf8-2.3.0" ]; }) - (sources."@aws-crypto/sha1-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-js-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/supports-web-crypto-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/util-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."@aws-sdk/client-s3-3.588.0" - sources."@aws-sdk/client-sso-3.588.0" - sources."@aws-sdk/client-sso-oidc-3.588.0" - sources."@aws-sdk/client-sts-3.588.0" - sources."@aws-sdk/core-3.588.0" - sources."@aws-sdk/credential-provider-env-3.587.0" - sources."@aws-sdk/credential-provider-http-3.587.0" - sources."@aws-sdk/credential-provider-ini-3.588.0" - sources."@aws-sdk/credential-provider-node-3.588.0" - sources."@aws-sdk/credential-provider-process-3.587.0" - sources."@aws-sdk/credential-provider-sso-3.588.0" - sources."@aws-sdk/credential-provider-web-identity-3.587.0" - (sources."@aws-sdk/lib-storage-3.588.0" // { + sources."@aws-sdk/client-s3-3.598.0" + sources."@aws-sdk/client-sso-3.598.0" + sources."@aws-sdk/client-sso-oidc-3.598.0" + sources."@aws-sdk/client-sts-3.598.0" + sources."@aws-sdk/core-3.598.0" + sources."@aws-sdk/credential-provider-env-3.598.0" + sources."@aws-sdk/credential-provider-http-3.598.0" + sources."@aws-sdk/credential-provider-ini-3.598.0" + sources."@aws-sdk/credential-provider-node-3.598.0" + sources."@aws-sdk/credential-provider-process-3.598.0" + sources."@aws-sdk/credential-provider-sso-3.598.0" + sources."@aws-sdk/credential-provider-web-identity-3.598.0" + (sources."@aws-sdk/lib-storage-3.598.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.587.0" - sources."@aws-sdk/middleware-expect-continue-3.577.0" - sources."@aws-sdk/middleware-flexible-checksums-3.587.0" - sources."@aws-sdk/middleware-host-header-3.577.0" - sources."@aws-sdk/middleware-location-constraint-3.577.0" - sources."@aws-sdk/middleware-logger-3.577.0" - sources."@aws-sdk/middleware-recursion-detection-3.577.0" - sources."@aws-sdk/middleware-sdk-s3-3.587.0" - sources."@aws-sdk/middleware-signing-3.587.0" - sources."@aws-sdk/middleware-ssec-3.577.0" - sources."@aws-sdk/middleware-user-agent-3.587.0" - sources."@aws-sdk/region-config-resolver-3.587.0" - sources."@aws-sdk/s3-presigned-post-3.588.0" - sources."@aws-sdk/s3-request-presigner-3.588.0" - sources."@aws-sdk/signature-v4-multi-region-3.587.0" - sources."@aws-sdk/token-providers-3.587.0" - sources."@aws-sdk/types-3.577.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.598.0" + sources."@aws-sdk/middleware-expect-continue-3.598.0" + (sources."@aws-sdk/middleware-flexible-checksums-3.598.0" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + ]; + }) + sources."@aws-sdk/middleware-host-header-3.598.0" + sources."@aws-sdk/middleware-location-constraint-3.598.0" + sources."@aws-sdk/middleware-logger-3.598.0" + sources."@aws-sdk/middleware-recursion-detection-3.598.0" + sources."@aws-sdk/middleware-sdk-s3-3.598.0" + sources."@aws-sdk/middleware-signing-3.598.0" + sources."@aws-sdk/middleware-ssec-3.598.0" + sources."@aws-sdk/middleware-user-agent-3.598.0" + sources."@aws-sdk/region-config-resolver-3.598.0" + sources."@aws-sdk/s3-presigned-post-3.598.0" + sources."@aws-sdk/s3-request-presigner-3.598.0" + sources."@aws-sdk/signature-v4-multi-region-3.598.0" + sources."@aws-sdk/token-providers-3.598.0" + sources."@aws-sdk/types-3.598.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-endpoints-3.587.0" - sources."@aws-sdk/util-format-url-3.577.0" + sources."@aws-sdk/util-endpoints-3.598.0" + sources."@aws-sdk/util-format-url-3.598.0" sources."@aws-sdk/util-locate-window-3.568.0" - sources."@aws-sdk/util-user-agent-browser-3.577.0" - sources."@aws-sdk/util-user-agent-node-3.587.0" + sources."@aws-sdk/util-user-agent-browser-3.598.0" + sources."@aws-sdk/util-user-agent-node-3.598.0" sources."@aws-sdk/util-utf8-browser-3.259.0" - sources."@aws-sdk/xml-builder-3.575.0" + sources."@aws-sdk/xml-builder-3.598.0" sources."@httptoolkit/websocket-stream-6.0.1" sources."@redis/bloom-1.2.0" sources."@redis/client-1.5.16" @@ -62025,61 +60965,85 @@ in sources."@redis/search-1.1.6" sources."@redis/time-series-1.0.5" sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-3.0.0" + sources."@smithy/abort-controller-3.0.1" sources."@smithy/chunked-blob-reader-3.0.0" sources."@smithy/chunked-blob-reader-native-3.0.0" - sources."@smithy/config-resolver-3.0.1" - sources."@smithy/core-2.1.1" - sources."@smithy/credential-provider-imds-3.1.0" - sources."@smithy/eventstream-codec-3.0.0" - sources."@smithy/eventstream-serde-browser-3.0.0" - sources."@smithy/eventstream-serde-config-resolver-3.0.0" - sources."@smithy/eventstream-serde-node-3.0.0" - sources."@smithy/eventstream-serde-universal-3.0.0" - sources."@smithy/fetch-http-handler-3.0.1" - sources."@smithy/hash-blob-browser-3.0.0" - sources."@smithy/hash-node-3.0.0" - sources."@smithy/hash-stream-node-3.0.0" - sources."@smithy/invalid-dependency-3.0.0" - sources."@smithy/is-array-buffer-3.0.0" - sources."@smithy/md5-js-3.0.0" - sources."@smithy/middleware-content-length-3.0.0" - sources."@smithy/middleware-endpoint-3.0.1" - sources."@smithy/middleware-retry-3.0.3" - sources."@smithy/middleware-serde-3.0.0" - sources."@smithy/middleware-stack-3.0.0" - sources."@smithy/node-config-provider-3.1.0" - sources."@smithy/node-http-handler-3.0.0" - sources."@smithy/property-provider-3.1.0" - sources."@smithy/protocol-http-4.0.0" - sources."@smithy/querystring-builder-3.0.0" - sources."@smithy/querystring-parser-3.0.0" - sources."@smithy/service-error-classification-3.0.0" - sources."@smithy/shared-ini-file-loader-3.1.0" - sources."@smithy/signature-v4-3.0.0" - sources."@smithy/smithy-client-3.1.1" - sources."@smithy/types-3.0.0" - sources."@smithy/url-parser-3.0.0" - sources."@smithy/util-base64-3.0.0" + sources."@smithy/config-resolver-3.0.2" + sources."@smithy/core-2.2.1" + sources."@smithy/credential-provider-imds-3.1.1" + sources."@smithy/eventstream-codec-3.1.0" + sources."@smithy/eventstream-serde-browser-3.0.2" + sources."@smithy/eventstream-serde-config-resolver-3.0.1" + sources."@smithy/eventstream-serde-node-3.0.2" + sources."@smithy/eventstream-serde-universal-3.0.2" + sources."@smithy/fetch-http-handler-3.0.2" + sources."@smithy/hash-blob-browser-3.1.0" + (sources."@smithy/hash-node-3.0.1" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + sources."@smithy/util-buffer-from-3.0.0" + ]; + }) + sources."@smithy/hash-stream-node-3.1.0" + sources."@smithy/invalid-dependency-3.0.1" + sources."@smithy/is-array-buffer-2.2.0" + sources."@smithy/md5-js-3.0.1" + sources."@smithy/middleware-content-length-3.0.1" + sources."@smithy/middleware-endpoint-3.0.2" + sources."@smithy/middleware-retry-3.0.4" + sources."@smithy/middleware-serde-3.0.1" + sources."@smithy/middleware-stack-3.0.1" + sources."@smithy/node-config-provider-3.1.1" + sources."@smithy/node-http-handler-3.0.1" + sources."@smithy/property-provider-3.1.1" + sources."@smithy/protocol-http-4.0.1" + sources."@smithy/querystring-builder-3.0.1" + sources."@smithy/querystring-parser-3.0.1" + sources."@smithy/service-error-classification-3.0.1" + sources."@smithy/shared-ini-file-loader-3.1.1" + (sources."@smithy/signature-v4-3.1.0" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + ]; + }) + sources."@smithy/smithy-client-3.1.2" + sources."@smithy/types-3.1.0" + sources."@smithy/url-parser-3.0.1" + (sources."@smithy/util-base64-3.0.0" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + sources."@smithy/util-buffer-from-3.0.0" + ]; + }) sources."@smithy/util-body-length-browser-3.0.0" sources."@smithy/util-body-length-node-3.0.0" - sources."@smithy/util-buffer-from-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.3" - sources."@smithy/util-defaults-mode-node-3.0.3" - sources."@smithy/util-endpoints-2.0.1" + sources."@smithy/util-defaults-mode-browser-3.0.4" + sources."@smithy/util-defaults-mode-node-3.0.4" + sources."@smithy/util-endpoints-2.0.2" sources."@smithy/util-hex-encoding-3.0.0" - sources."@smithy/util-middleware-3.0.0" - sources."@smithy/util-retry-3.0.0" - sources."@smithy/util-stream-3.0.1" + sources."@smithy/util-middleware-3.0.1" + sources."@smithy/util-retry-3.0.1" + (sources."@smithy/util-stream-3.0.2" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + sources."@smithy/util-buffer-from-3.0.0" + ]; + }) sources."@smithy/util-uri-escape-3.0.0" - sources."@smithy/util-utf8-3.0.0" - sources."@smithy/util-waiter-3.0.0" + (sources."@smithy/util-utf8-3.0.0" // { + dependencies = [ + sources."@smithy/is-array-buffer-3.0.0" + sources."@smithy/util-buffer-from-3.0.0" + ]; + }) + sources."@smithy/util-waiter-3.0.1" 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.14.1" + sources."@types/node-20.14.2" sources."@types/responselike-1.0.3" sources."@types/ws-8.5.10" sources."accepts-1.3.8" @@ -62088,7 +61052,7 @@ in sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.21.2" + sources."aws-crt-1.21.3" (sources."axios-1.7.2" // { dependencies = [ sources."form-data-4.0.0" @@ -62367,7 +61331,7 @@ in sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" sources."retry-0.12.0" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.6.2" @@ -62409,7 +61373,7 @@ in sources."supports-color-7.2.0" sources."tdigest-0.1.2" sources."toidentifier-1.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tus-js-client-3.1.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -62439,137 +61403,6 @@ in bypassCache = true; reconstructLock = true; }; - "@volar/vue-language-server" = nodeEnv.buildNodePackage { - name = "_at_volar_slash_vue-language-server"; - packageName = "@volar/vue-language-server"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/vue-language-server/-/vue-language-server-1.6.5.tgz"; - sha512 = "+/kSxBAkZbeVBePoG2qRSvCkVIslk1dNlU5wQHAcbzOFTi7pEQR6C+kjoj94I+vGXVGMFfDwOYm07sPsd8dM6w=="; - }; - dependencies = [ - sources."@babel/parser-7.24.6" - sources."@emmetio/abbreviation-2.3.3" - sources."@emmetio/css-abbreviation-2.1.8" - sources."@emmetio/scanner-1.0.4" - sources."@johnsoncodehk/pug-beautify-0.2.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@volar-plugins/css-2.0.0" - sources."@volar-plugins/emmet-2.0.0" - sources."@volar-plugins/html-2.0.0" - sources."@volar-plugins/json-2.0.0" - sources."@volar-plugins/pug-2.0.0" - sources."@volar-plugins/pug-beautify-2.0.0" - sources."@volar-plugins/typescript-2.0.0" - sources."@volar-plugins/typescript-twoslash-queries-2.0.0" - sources."@volar/language-core-1.4.1" - sources."@volar/language-server-1.4.1" - sources."@volar/language-service-1.4.1" - sources."@volar/source-map-1.4.1" - sources."@volar/vue-language-core-1.6.5" - sources."@volar/vue-language-service-1.6.5" - (sources."@vscode/emmet-helper-2.9.3" // { - dependencies = [ - sources."jsonc-parser-2.3.1" - sources."vscode-uri-2.1.2" - ]; - }) - sources."@vscode/l10n-0.0.11" - sources."@vue/compiler-core-3.4.27" - sources."@vue/compiler-dom-3.4.27" - sources."@vue/compiler-sfc-3.4.27" - sources."@vue/compiler-ssr-3.4.27" - sources."@vue/reactivity-3.4.27" - sources."@vue/shared-3.4.27" - sources."acorn-7.4.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."call-bind-1.0.7" - sources."character-parser-2.2.0" - sources."de-indent-1.0.2" - sources."define-data-property-1.1.4" - sources."emmet-2.4.7" - sources."entities-4.5.0" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."estree-walker-2.0.2" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."gopd-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.2" - sources."hasown-2.0.2" - sources."he-1.2.0" - sources."is-expression-4.0.0" - sources."is-regex-1.1.4" - sources."jsonc-parser-3.2.1" - sources."magic-string-0.30.10" - sources."minimatch-9.0.4" - sources."muggle-string-0.2.2" - sources."nanoid-3.3.7" - sources."object-assign-4.1.1" - sources."picocolors-1.0.1" - sources."postcss-8.4.38" - sources."pug-error-2.1.0" - sources."pug-lexer-5.0.1" - sources."pug-parser-6.0.0" - sources."request-light-0.7.0" - sources."semver-7.6.2" - sources."set-function-length-1.2.2" - sources."source-map-js-1.2.0" - sources."token-stream-1.0.0" - sources."typesafe-path-0.2.2" - sources."typescript-5.4.5" - sources."typescript-auto-import-cache-0.2.1" - (sources."vscode-css-languageservice-6.2.14" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - sources."vscode-languageserver-types-3.17.5" - ]; - }) - (sources."vscode-html-languageservice-5.2.0" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - sources."vscode-languageserver-types-3.17.5" - ]; - }) - (sources."vscode-json-languageservice-5.3.11" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - sources."vscode-languageserver-types-3.17.5" - ]; - }) - sources."vscode-jsonrpc-8.1.0" - (sources."vscode-languageserver-8.1.0" // { - dependencies = [ - sources."vscode-languageserver-protocol-3.17.3" - ]; - }) - (sources."vscode-languageserver-protocol-3.17.5" // { - dependencies = [ - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-types-3.17.5" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.3" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.8" - sources."vue-component-meta-1.6.5" - sources."vue-component-type-helpers-1.6.5" - sources."vue-template-compiler-2.7.16" - ]; - buildInputs = globalBuildInputs; - meta = { - homepage = "https://github.com/vuejs/language-tools#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -62598,53 +61431,53 @@ in sources."@apollo/utils.usagereporting-1.0.1" sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.6" - sources."@babel/helper-annotate-as-pure-7.24.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/generator-7.24.7" + 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.7" // { 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.6" // { + (sources."@babel/helper-create-class-features-plugin-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.24.6" // { + (sources."@babel/helper-create-regexp-features-plugin-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) sources."@babel/helper-define-polyfill-provider-0.6.2" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-member-expression-to-functions-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-optimise-call-expression-7.24.6" - sources."@babel/helper-plugin-utils-7.24.6" - sources."@babel/helper-remap-async-to-generator-7.24.6" - sources."@babel/helper-replace-supers-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helper-wrap-function-7.24.6" - sources."@babel/helpers-7.24.6" - (sources."@babel/highlight-7.24.6" // { + 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.7" + sources."@babel/helper-module-imports-7.24.7" + sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-remap-async-to-generator-7.24.7" + sources."@babel/helper-replace-supers-7.24.7" + 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.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helper-wrap-function-7.24.7" + sources."@babel/helpers-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -62654,11 +61487,11 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.24.6" - sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6" - sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6" + sources."@babel/parser-7.24.7" + 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/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-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.21.0" @@ -62668,12 +61501,12 @@ in sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.24.6" - sources."@babel/plugin-syntax-import-assertions-7.24.6" - sources."@babel/plugin-syntax-import-attributes-7.24.6" + 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-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.24.6" + sources."@babel/plugin-syntax-jsx-7.24.7" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -62682,66 +61515,66 @@ 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.6" + sources."@babel/plugin-syntax-typescript-7.24.7" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.24.6" - sources."@babel/plugin-transform-async-generator-functions-7.24.6" - sources."@babel/plugin-transform-async-to-generator-7.24.6" - sources."@babel/plugin-transform-block-scoped-functions-7.24.6" - sources."@babel/plugin-transform-block-scoping-7.24.6" - sources."@babel/plugin-transform-class-properties-7.24.6" - sources."@babel/plugin-transform-class-static-block-7.24.6" - sources."@babel/plugin-transform-classes-7.24.6" - sources."@babel/plugin-transform-computed-properties-7.24.6" - sources."@babel/plugin-transform-destructuring-7.24.6" - sources."@babel/plugin-transform-dotall-regex-7.24.6" - sources."@babel/plugin-transform-duplicate-keys-7.24.6" - sources."@babel/plugin-transform-dynamic-import-7.24.6" - sources."@babel/plugin-transform-exponentiation-operator-7.24.6" - sources."@babel/plugin-transform-export-namespace-from-7.24.6" - sources."@babel/plugin-transform-flow-strip-types-7.24.6" - sources."@babel/plugin-transform-for-of-7.24.6" - sources."@babel/plugin-transform-function-name-7.24.6" - sources."@babel/plugin-transform-json-strings-7.24.6" - sources."@babel/plugin-transform-literals-7.24.6" - sources."@babel/plugin-transform-logical-assignment-operators-7.24.6" - sources."@babel/plugin-transform-member-expression-literals-7.24.6" - sources."@babel/plugin-transform-modules-amd-7.24.6" - sources."@babel/plugin-transform-modules-commonjs-7.24.6" - sources."@babel/plugin-transform-modules-systemjs-7.24.6" - sources."@babel/plugin-transform-modules-umd-7.24.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.6" - sources."@babel/plugin-transform-new-target-7.24.6" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.24.6" - sources."@babel/plugin-transform-numeric-separator-7.24.6" - sources."@babel/plugin-transform-object-rest-spread-7.24.6" - sources."@babel/plugin-transform-object-super-7.24.6" - sources."@babel/plugin-transform-optional-catch-binding-7.24.6" - sources."@babel/plugin-transform-optional-chaining-7.24.6" - sources."@babel/plugin-transform-parameters-7.24.6" - sources."@babel/plugin-transform-private-methods-7.24.6" - sources."@babel/plugin-transform-private-property-in-object-7.24.6" - sources."@babel/plugin-transform-property-literals-7.24.6" - sources."@babel/plugin-transform-regenerator-7.24.6" - sources."@babel/plugin-transform-reserved-words-7.24.6" - sources."@babel/plugin-transform-shorthand-properties-7.24.6" - sources."@babel/plugin-transform-spread-7.24.6" - sources."@babel/plugin-transform-sticky-regex-7.24.6" - sources."@babel/plugin-transform-template-literals-7.24.6" - sources."@babel/plugin-transform-typeof-symbol-7.24.6" - sources."@babel/plugin-transform-typescript-7.24.6" - sources."@babel/plugin-transform-unicode-escapes-7.24.6" - sources."@babel/plugin-transform-unicode-property-regex-7.24.6" - sources."@babel/plugin-transform-unicode-regex-7.24.6" - sources."@babel/plugin-transform-unicode-sets-regex-7.24.6" - (sources."@babel/preset-env-7.24.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-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-class-static-block-7.24.7" + sources."@babel/plugin-transform-classes-7.24.7" + sources."@babel/plugin-transform-computed-properties-7.24.7" + sources."@babel/plugin-transform-destructuring-7.24.7" + sources."@babel/plugin-transform-dotall-regex-7.24.7" + sources."@babel/plugin-transform-duplicate-keys-7.24.7" + 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-for-of-7.24.7" + sources."@babel/plugin-transform-function-name-7.24.7" + sources."@babel/plugin-transform-json-strings-7.24.7" + sources."@babel/plugin-transform-literals-7.24.7" + 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.7" + sources."@babel/plugin-transform-modules-systemjs-7.24.7" + 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-nullish-coalescing-operator-7.24.7" + sources."@babel/plugin-transform-numeric-separator-7.24.7" + sources."@babel/plugin-transform-object-rest-spread-7.24.7" + sources."@babel/plugin-transform-object-super-7.24.7" + sources."@babel/plugin-transform-optional-catch-binding-7.24.7" + sources."@babel/plugin-transform-optional-chaining-7.24.7" + sources."@babel/plugin-transform-parameters-7.24.7" + sources."@babel/plugin-transform-private-methods-7.24.7" + sources."@babel/plugin-transform-private-property-in-object-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-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.7" + sources."@babel/plugin-transform-typescript-7.24.7" + 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.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/preset-flow-7.24.6" + sources."@babel/preset-flow-7.24.7" sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.24.6" + sources."@babel/preset-typescript-7.24.7" (sources."@babel/register-7.24.6" // { dependencies = [ sources."make-dir-2.1.0" @@ -62750,10 +61583,10 @@ in ]; }) sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/runtime-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.20" // { dependencies = [ @@ -62809,7 +61642,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-1.3.5" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/normalize-package-data-2.4.4" sources."@types/qs-6.9.15" sources."@types/range-parser-1.2.7" @@ -62824,14 +61657,14 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - (sources."@vue/compiler-core-3.4.27" // { + (sources."@vue/compiler-core-3.4.29" // { dependencies = [ sources."entities-4.5.0" ]; }) - sources."@vue/compiler-dom-3.4.27" + sources."@vue/compiler-dom-3.4.29" sources."@vue/compiler-sfc-2.7.16" - sources."@vue/shared-3.4.27" + sources."@vue/shared-3.4.29" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -62904,7 +61737,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -62923,7 +61756,7 @@ in }) sources."call-bind-1.0.7" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -63023,7 +61856,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.10" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -63122,7 +61955,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.237.2" + sources."flow-parser-0.238.0" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -63594,7 +62427,7 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" @@ -63805,14 +62638,14 @@ in sha512 = "7SWOLN+1eZ5e9gohQPVdA8XQstGIYei/70T5kmLP6vC41zy8BBYNt35OgLZmbpg3iOQ1vWT17ZMhVikSJySSRg=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/generator-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/generator-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/types-7.24.7" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -63891,9 +62724,9 @@ in sha512 = "rKLBZxD/lvuykdC6XB8ma9YjDl46j9ayHROZUtC1yJ2jlGpoP7RZR1tBBSjtlr260ixIW6iCkqAnHzmti5Q6CQ=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" sources."@isaacs/cliui-8.0.2" sources."@npmcli/config-6.4.1" (sources."@npmcli/map-workspaces-3.0.6" // { @@ -63929,7 +62762,7 @@ in sources."@types/supports-color-8.1.3" sources."@types/unist-2.0.10" sources."abbrev-2.0.0" - sources."acorn-8.11.3" + sources."acorn-8.12.0" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -64024,7 +62857,7 @@ in sources."extend-3.0.2" sources."fault-2.0.1" sources."find-up-6.3.0" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" @@ -64094,7 +62927,7 @@ in sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" @@ -64407,7 +63240,7 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yargs-parser-21.1.1" sources."yocto-queue-1.0.0" sources."zwitch-2.0.4" @@ -64481,9 +63314,9 @@ in sha512 = "BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew=="; }; dependencies = [ - sources."browserslist-4.23.0" - sources."caniuse-lite-1.0.30001627" - sources."electron-to-chromium-1.4.789" + sources."browserslist-4.23.1" + sources."caniuse-lite-1.0.30001634" + sources."electron-to-chromium-1.4.802" sources."escalade-3.1.2" sources."fraction.js-4.3.7" sources."nanoid-3.3.7" @@ -64505,49 +63338,13 @@ in bypassCache = true; reconstructLock = true; }; - auto-changelog = nodeEnv.buildNodePackage { - name = "auto-changelog"; - packageName = "auto-changelog"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-2.4.0.tgz"; - sha512 = "vh17hko1c0ItsEcw6m7qPRf3m45u+XK5QyCrrBFViElZ8jnKrPC1roSznrd1fIB/0vR/zawdECCRJtTuqIXaJw=="; - }; - dependencies = [ - sources."commander-7.2.0" - sources."encoding-0.1.13" - sources."handlebars-4.7.8" - sources."iconv-lite-0.6.3" - sources."minimist-1.2.8" - sources."neo-async-2.6.2" - sources."node-fetch-2.7.0" - sources."parse-github-url-1.0.2" - sources."safer-buffer-2.1.2" - sources."semver-7.6.2" - sources."source-map-0.6.1" - sources."tr46-0.0.3" - sources."uglify-js-3.17.4" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line tool for generating a changelog from git tags and commit history"; - homepage = "https://github.com/CookPete/auto-changelog"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.144.0"; + version = "2.146.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.144.0.tgz"; - sha512 = "qsTZGCceKi15oOYbWvWpIZNBHRZa+WTV5IIN20leQV9PVRxzHGN58VCOIAiyT1+CncDYjY9grLXEGAOuKRynFQ=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.146.0.tgz"; + sha512 = "uLotAflIqQn8rskLC1r2NGNMaTwDgW8Vq016QiACmatIcp2n/hfNlwazg+hRlSzq2FwGda6Qht2aOlsGm0QcBw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -64565,15 +63362,15 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-1.1.0.tgz"; - sha512 = "ir+DFe1D3P2y18JP7E2xeOoBpO8dtB+NbS+oASU51FbeJs/PhC/XPNxw1spHuu9CJt3YfGJYZUYq+NafInWu+A=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-1.2.0.tgz"; + sha512 = "XDILMHYIffDRnPzxCQ/P3jWtpPVrbcPvHh8JdGRHtnWsSu5LNZ5rcS8AEKf9iOhqaJrB7TvpYBKe7iZRx17k/A=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -64581,17 +63378,15 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@sec-ant/readable-stream-0.4.1" sources."@sindresorhus/is-5.6.0" + 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.10" sources."@types/estree-1.0.5" sources."@types/estree-jsx-1.0.5" - (sources."@types/hast-2.3.10" // { - dependencies = [ - sources."@types/unist-2.0.10" - ]; - }) + sources."@types/hast-3.0.4" sources."@types/http-cache-semantics-4.0.4" sources."@types/json-schema-7.0.15" sources."@types/mdast-4.0.4" @@ -64611,11 +63406,8 @@ in sources."assert-valid-glob-opts-1.0.0" sources."bail-2.0.2" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-5.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."buffer-6.0.3" sources."cacheable-lookup-7.0.0" (sources."cacheable-request-10.2.14" // { dependencies = [ @@ -64623,11 +63415,16 @@ in ]; }) sources."case-1.6.3" + sources."ccount-2.0.1" sources."chalk-5.3.0" sources."character-entities-2.0.2" + 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-spinners-2.9.2" sources."co-3.1.0" + sources."collapse-white-space-2.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -64647,11 +63444,7 @@ in sources."defer-to-connect-2.0.1" sources."dequal-2.0.3" sources."devlop-1.1.0" - sources."diff-5.2.0" - sources."dir-glob-3.0.1" - sources."eastasianwidth-0.2.0" sources."emoji-regex-10.3.0" - sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" (sources."eslint-formatter-pretty-5.0.0" // { dependencies = [ @@ -64670,21 +63463,27 @@ in ]; }) sources."eslint-rule-docs-1.1.235" - sources."execa-8.0.1" + sources."execa-9.2.0" sources."extend-3.0.2" sources."fast-glob-3.3.2" sources."fastq-1.17.1" + sources."figures-6.1.0" sources."fill-range-7.1.1" sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."get-stream-8.0.1" + sources."get-east-asian-width-1.2.0" + sources."get-stream-9.0.1" sources."github-slugger-2.0.0" sources."github-url-to-object-4.0.6" sources."glob-7.2.3" sources."glob-option-error-1.0.0" sources."glob-parent-5.1.2" - sources."globby-13.2.2" + (sources."globby-14.0.1" // { + dependencies = [ + sources."@sindresorhus/merge-streams-2.3.0" + ]; + }) (sources."got-13.0.0" // { dependencies = [ sources."get-stream-6.0.1" @@ -64696,93 +63495,57 @@ in sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.1" - sources."human-signals-5.0.0" - sources."ieee754-1.2.1" + sources."human-signals-7.0.0" sources."ignore-5.3.1" + sources."index-to-position-0.1.2" sources."indexed-filter-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" sources."irregular-plurals-3.5.0" - sources."is-arrayish-0.2.1" + sources."is-alphabetical-2.0.1" + sources."is-alphanumerical-2.0.1" sources."is-buffer-2.0.5" sources."is-core-module-2.13.1" + sources."is-decimal-2.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-github-url-1.2.2" sources."is-glob-4.0.3" + sources."is-hexadecimal-2.0.1" sources."is-interactive-2.0.0" sources."is-number-7.0.0" sources."is-plain-obj-4.1.0" - sources."is-stream-3.0.0" - sources."is-unicode-supported-1.3.0" + sources."is-stream-4.0.1" + sources."is-unicode-supported-2.0.0" sources."is-url-1.2.4" sources."is-url-superb-6.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-3.0.2" sources."keyv-4.5.4" sources."kind-of-6.0.3" - sources."kleur-4.1.5" - sources."lines-and-columns-2.0.4" sources."lodash.iteratee-4.7.0" - sources."log-symbols-5.1.0" + (sources."log-symbols-6.0.0" // { + dependencies = [ + sources."is-unicode-supported-1.3.0" + ]; + }) sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" sources."lru-cache-10.2.2" - (sources."mdast-comment-marker-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - ]; - }) + sources."mdast-comment-marker-3.0.0" + sources."mdast-util-directive-3.0.0" sources."mdast-util-from-markdown-2.0.1" - (sources."mdast-util-heading-style-2.0.1" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - ]; - }) - (sources."mdast-util-mdx-expression-1.3.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."mdast-util-from-markdown-1.3.1" - sources."mdast-util-phrasing-3.0.1" - sources."mdast-util-to-markdown-1.5.0" - sources."mdast-util-to-string-3.2.0" - sources."micromark-3.2.0" - sources."micromark-core-commonmark-1.1.0" - sources."micromark-factory-destination-1.1.0" - sources."micromark-factory-label-1.1.0" - sources."micromark-factory-space-1.1.0" - sources."micromark-factory-title-1.1.0" - sources."micromark-factory-whitespace-1.1.0" - sources."micromark-util-character-1.2.0" - sources."micromark-util-chunked-1.1.0" - sources."micromark-util-classify-character-1.1.0" - sources."micromark-util-combine-extensions-1.1.0" - sources."micromark-util-decode-numeric-character-reference-1.1.0" - sources."micromark-util-decode-string-1.1.0" - sources."micromark-util-encode-1.1.0" - sources."micromark-util-html-tag-name-1.2.0" - sources."micromark-util-normalize-identifier-1.1.0" - sources."micromark-util-resolve-all-1.1.0" - sources."micromark-util-sanitize-uri-1.2.0" - sources."micromark-util-subtokenize-1.1.0" - sources."micromark-util-symbol-1.1.0" - sources."micromark-util-types-1.1.0" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - ]; - }) + 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-mdxjs-esm-2.0.1" sources."mdast-util-phrasing-4.1.0" sources."mdast-util-to-markdown-2.1.0" sources."mdast-util-to-string-4.0.0" - sources."meow-12.1.1" - sources."merge-stream-2.0.0" + sources."meow-13.2.0" sources."merge2-1.4.1" sources."micromark-4.0.0" sources."micromark-core-commonmark-2.0.1" @@ -64806,10 +63569,9 @@ in sources."micromark-util-symbol-2.0.0" sources."micromark-util-types-2.0.0" sources."micromatch-4.0.7" - sources."mimic-fn-4.0.0" + sources."mimic-fn-2.1.0" sources."mimic-response-4.0.0" sources."minimatch-3.1.2" - sources."mri-1.2.0" sources."ms-2.1.2" sources."normalize-package-data-6.0.1" sources."normalize-url-8.0.1" @@ -64820,233 +63582,61 @@ in }) sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-6.0.0" - sources."ora-7.0.1" + sources."onetime-5.1.2" + sources."ora-8.0.1" sources."p-cancelable-3.0.0" - sources."parse-github-url-1.0.2" - (sources."parse-json-7.1.1" // { + (sources."parse-entities-4.0.1" // { dependencies = [ - sources."type-fest-3.13.1" + sources."@types/unist-2.0.10" ]; }) + sources."parse-github-url-1.0.2" + sources."parse-json-8.1.0" + sources."parse-ms-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-type-4.0.0" + sources."path-type-5.0.0" sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."plur-4.0.0" sources."pluralize-8.0.0" + sources."pretty-ms-9.0.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."read-pkg-8.1.0" - sources."readable-stream-3.6.2" + sources."quotation-2.0.3" + sources."read-pkg-9.0.1" sources."remark-15.0.1" - (sources."remark-lint-9.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-blockquote-indentation-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-checkbox-character-style-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-checkbox-content-indent-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-code-block-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-definition-case-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-definition-spacing-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."remark-lint-10.0.0" + sources."remark-lint-blockquote-indentation-4.0.0" + sources."remark-lint-checkbox-character-style-5.0.0" + sources."remark-lint-checkbox-content-indent-5.0.0" + sources."remark-lint-code-block-style-4.0.0" + sources."remark-lint-definition-case-4.0.0" + sources."remark-lint-definition-spacing-4.0.0" (sources."remark-lint-double-link-0.2.0" // { dependencies = [ sources."@types/unist-2.0.10" sources."normalize-url-5.3.1" - sources."unist-util-is-5.2.1" - sources."unist-util-visit-4.1.2" - ]; - }) - (sources."remark-lint-emphasis-marker-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-fenced-code-marker-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-file-extension-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-final-newline-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-hard-break-spaces-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-heading-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-link-title-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-list-item-bullet-indent-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-list-item-content-indent-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-list-item-indent-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" sources."unified-10.1.2" + sources."unified-lint-rule-2.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-4.1.2" + sources."unist-util-visit-parents-5.1.3" sources."vfile-5.3.7" sources."vfile-message-3.1.4" ]; }) + sources."remark-lint-emphasis-marker-4.0.0" + sources."remark-lint-fenced-code-marker-4.0.0" + sources."remark-lint-file-extension-3.0.0" + sources."remark-lint-final-newline-3.0.0" + sources."remark-lint-hard-break-spaces-4.0.0" + sources."remark-lint-heading-style-4.0.0" + sources."remark-lint-link-title-style-4.0.0" + sources."remark-lint-list-item-bullet-indent-5.0.0" + sources."remark-lint-list-item-content-indent-4.0.0" + sources."remark-lint-list-item-indent-4.0.0" (sources."remark-lint-match-punctuation-0.2.1" // { dependencies = [ sources."unified-lint-rule-1.0.6" @@ -65058,37 +63648,19 @@ in sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" + sources."unified-lint-rule-2.1.2" + sources."unist-util-generated-2.0.1" sources."unist-util-is-5.2.1" + sources."unist-util-position-4.0.4" sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-4.1.2" + sources."unist-util-visit-parents-5.1.3" sources."vfile-5.3.7" sources."vfile-message-3.1.4" ]; }) - (sources."remark-lint-no-blockquote-without-marker-5.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-emphasis-as-heading-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."remark-lint-no-blockquote-without-marker-6.0.0" + sources."remark-lint-no-emphasis-as-heading-4.0.0" (sources."remark-lint-no-empty-sections-4.0.0" // { dependencies = [ sources."mdast-util-to-string-1.1.0" @@ -65098,315 +63670,57 @@ in sources."unist-util-visit-parents-2.1.2" ]; }) - (sources."remark-lint-no-file-name-articles-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-file-name-consecutive-dashes-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-file-name-irregular-characters-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-file-name-mixed-case-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-file-name-outer-dashes-2.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-heading-content-indent-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-heading-indent-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-heading-punctuation-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."mdast-util-to-string-3.2.0" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."remark-lint-no-file-name-articles-3.0.0" + sources."remark-lint-no-file-name-consecutive-dashes-3.0.0" + sources."remark-lint-no-file-name-irregular-characters-3.0.0" + sources."remark-lint-no-file-name-mixed-case-3.0.0" + sources."remark-lint-no-file-name-outer-dashes-3.0.0" + sources."remark-lint-no-heading-content-indent-5.0.0" + sources."remark-lint-no-heading-indent-5.0.0" + sources."remark-lint-no-heading-punctuation-4.0.0" (sources."remark-lint-no-inline-padding-4.1.2" // { dependencies = [ sources."@types/mdast-3.0.15" sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" + sources."unified-lint-rule-2.1.2" + sources."unist-util-generated-2.0.1" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-4.1.2" + sources."unist-util-visit-parents-5.1.3" sources."vfile-5.3.7" sources."vfile-message-3.1.4" ]; }) - (sources."remark-lint-no-multiple-toplevel-headings-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."remark-lint-no-multiple-toplevel-headings-4.0.0" (sources."remark-lint-no-repeat-punctuation-0.1.4" // { dependencies = [ sources."unified-lint-rule-1.0.6" ]; }) - (sources."remark-lint-no-shell-dollars-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-table-indentation-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-undefined-references-4.2.1" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."micromark-util-normalize-identifier-1.1.0" - sources."micromark-util-symbol-1.1.0" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-unneeded-full-reference-image-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."micromark-util-normalize-identifier-1.1.0" - sources."micromark-util-symbol-1.1.0" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-unneeded-full-reference-link-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."micromark-util-normalize-identifier-1.1.0" - sources."micromark-util-symbol-1.1.0" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-no-unused-definitions-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-ordered-list-marker-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-ordered-list-marker-value-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-rule-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-strong-marker-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-table-cell-padding-4.1.3" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-table-pipe-alignment-3.1.3" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-table-pipes-4.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-lint-unordered-list-marker-style-3.1.2" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-4.1.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."remark-message-control-7.1.1" // { - dependencies = [ - sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."remark-lint-no-shell-dollars-4.0.0" + sources."remark-lint-no-table-indentation-5.0.0" + sources."remark-lint-no-undefined-references-5.0.0" + sources."remark-lint-no-unneeded-full-reference-image-4.0.0" + sources."remark-lint-no-unneeded-full-reference-link-4.0.0" + sources."remark-lint-no-unused-definitions-4.0.0" + sources."remark-lint-ordered-list-marker-style-4.0.0" + sources."remark-lint-ordered-list-marker-value-4.0.0" + sources."remark-lint-rule-style-4.0.0" + sources."remark-lint-strong-marker-4.0.0" + sources."remark-lint-table-cell-padding-5.0.0" + sources."remark-lint-table-pipe-alignment-4.0.0" + sources."remark-lint-table-pipes-5.0.0" + sources."remark-lint-unordered-list-marker-style-4.0.0" + sources."remark-message-control-8.0.0" sources."remark-parse-11.0.0" 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."mimic-fn-2.1.0" - sources."onetime-5.1.2" sources."signal-exit-3.0.7" ]; }) @@ -65414,23 +63728,22 @@ in sources."rimraf-2.7.1" sources."rmfr-2.0.0" sources."run-parallel-1.2.0" - sources."sade-1.8.1" - sources."safe-buffer-5.2.1" sources."semver-7.6.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."slash-4.0.0" + sources."slash-5.1.0" sources."sliced-1.0.1" + sources."space-separated-tokens-2.0.2" 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."stdin-discarder-0.1.0" - sources."string-width-6.1.0" - sources."string_decoder-1.3.0" + sources."stdin-discarder-0.2.2" + sources."string-width-7.1.0" + sources."stringify-entities-4.0.4" sources."strip-ansi-7.1.0" - sources."strip-final-newline-3.0.0" + sources."strip-final-newline-4.0.0" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { dependencies = [ @@ -65441,34 +63754,18 @@ in sources."temp-dir-3.0.0" (sources."tempy-3.1.0" // { dependencies = [ + sources."is-stream-3.0.0" sources."type-fest-2.19.0" ]; }) sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" sources."trough-2.2.0" - sources."type-fest-4.18.3" + sources."type-fest-4.20.0" + sources."unicorn-magic-0.1.0" sources."unified-11.0.4" - (sources."unified-lint-rule-2.1.2" // { - dependencies = [ - sources."@types/unist-2.0.10" - sources."unified-10.1.2" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) - (sources."unified-message-control-4.0.0" // { - dependencies = [ - sources."@types/unist-2.0.10" - sources."unist-util-is-5.2.1" - sources."unist-util-stringify-position-3.0.3" - sources."unist-util-visit-3.1.0" - sources."unist-util-visit-parents-4.1.1" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."unified-lint-rule-3.0.0" + sources."unified-message-control-5.0.0" sources."unique-string-3.0.0" sources."unist-util-find-3.0.0" sources."unist-util-find-all-after-5.0.0" @@ -65482,36 +63779,21 @@ in sources."unist-util-visit-parents-3.1.1" ]; }) - sources."unist-util-generated-2.0.1" + sources."unist-util-generated-1.1.6" sources."unist-util-is-6.0.0" sources."unist-util-map-1.0.5" - (sources."unist-util-position-4.0.4" // { - dependencies = [ - sources."@types/unist-2.0.10" - ]; - }) + 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 = [ - sources."unist-util-generated-1.1.6" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" ]; }) - (sources."unist-util-visit-5.0.0" // { - dependencies = [ - sources."unist-util-visit-parents-6.0.1" - ]; - }) - (sources."unist-util-visit-parents-5.1.3" // { - dependencies = [ - sources."@types/unist-2.0.10" - sources."unist-util-is-5.2.1" - ]; - }) - sources."util-deprecate-1.0.2" - sources."uvu-0.5.6" + sources."unist-util-visit-5.0.0" + sources."unist-util-visit-parents-6.0.1" (sources."validate-glob-opts-1.0.2" // { dependencies = [ sources."is-plain-obj-1.1.0" @@ -65519,14 +63801,7 @@ in }) sources."validate-npm-package-license-3.0.4" sources."vfile-6.0.1" - (sources."vfile-location-4.1.0" // { - dependencies = [ - sources."@types/unist-2.0.10" - sources."unist-util-stringify-position-3.0.3" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - ]; - }) + sources."vfile-location-5.0.2" sources."vfile-message-4.0.2" sources."vfile-reporter-pretty-7.0.0" sources."vfile-statistics-3.0.0" @@ -65534,6 +63809,7 @@ in sources."which-2.0.2" sources."wrapped-1.0.1" sources."wrappy-1.0.2" + sources."yoctocolors-2.0.2" sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; @@ -65935,7 +64211,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.1" + sources."@types/node-20.14.2" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -66111,16 +64387,16 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.198.137"; + version = "2.198.145"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.137.tgz"; - sha512 = "0qYRS2z80eVdeYdA9YI08VaAPbXntbHjkXd0jcoWSmVZwLaSkigMbxXYTYPGDVN+cOtBHNhWjcv9iQLVSGG6PA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.145.tgz"; + sha512 = "I1tHAcRV6k0zk32Row37Ds8eoQC0LmRrT62EMQuyyaivAus1AgGD7dGn3cw+idJCepfxME6Rrc7jOvIa/Mv3Jg=="; }; dependencies = [ sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.99.0" - sources."@jsii/spec-1.99.0" + sources."@jsii/check-node-1.100.0" + sources."@jsii/spec-1.100.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -66140,7 +64416,7 @@ in sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -66155,13 +64431,7 @@ in sources."axios-0.27.2" (sources."backport-8.5.0" // { dependencies = [ - sources."cliui-8.0.1" - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" ]; }) sources."balanced-match-1.0.2" @@ -66174,7 +64444,7 @@ in sources."call-bind-1.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.68.75" + sources."cdk8s-2.68.79" sources."cdk8s-plus-25-2.22.79" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -66182,9 +64452,13 @@ in sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.2" sources."cli-width-3.0.0" - sources."cliui-7.0.4" - sources."clone-2.1.2" - (sources."codemaker-1.99.0" // { + (sources."cliui-8.0.1" // { + dependencies = [ + sources."wrap-ansi-7.0.0" + ]; + }) + sources."clone-1.0.4" + (sources."codemaker-1.100.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -66208,14 +64482,14 @@ in 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."decamelize-5.0.1" - sources."dedent-0.7.0" - (sources."defaults-1.0.4" // { + (sources."debug-4.3.5" // { dependencies = [ - sources."clone-1.0.4" + sources."ms-2.1.2" ]; }) + 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" @@ -66228,7 +64502,7 @@ in sources."dotenv-16.4.5" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240604" + sources."typescript-5.6.0-dev.20240614" ]; }) sources."emoji-regex-8.0.0" @@ -66242,7 +64516,7 @@ in sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" sources."escalade-3.1.2" - sources."escape-string-regexp-4.0.0" + sources."escape-string-regexp-1.0.5" (sources."external-editor-3.1.0" // { dependencies = [ sources."iconv-lite-0.4.24" @@ -66250,16 +64524,11 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fast-uri-2.3.0" sources."fastq-1.17.1" sources."fecha-4.2.3" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) + sources."figures-3.2.0" sources."fill-range-7.1.1" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."flatted-3.3.1" sources."fn.name-1.1.0" sources."follow-redirects-1.15.6" @@ -66284,7 +64553,7 @@ in sources."globby-11.1.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."graphql-16.8.1" + sources."graphql-16.8.2" sources."graphql-tag-2.12.6" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" @@ -66299,11 +64568,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) + sources."inquirer-8.2.6" sources."internal-slot-1.0.7" sources."interpret-1.4.0" sources."is-array-buffer-3.0.4" @@ -66333,48 +64598,50 @@ in sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."isarray-2.0.5" - (sources."jsii-5.4.20" // { + (sources."jsii-5.4.21" // { dependencies = [ - sources."@jsii/check-node-1.98.0" - sources."cliui-8.0.1" + sources."@jsii/check-node-1.99.0" sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" ]; }) - (sources."jsii-pacmak-1.99.0" // { + (sources."jsii-pacmak-1.100.0" // { 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.99.0" // { + (sources."jsii-reflect-1.100.0" // { 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.21" // { dependencies = [ sources."@jsii/check-node-1.98.0" - sources."cliui-8.0.1" sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" ]; }) - (sources."jsii-srcmak-0.1.1143" // { + (sources."jsii-srcmak-0.1.1154" // { 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.3" + sources."json2jsii-0.4.4" sources."jsonfile-6.1.0" sources."kuler-2.0.0" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" @@ -66394,7 +64661,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."ncp-2.0.0" sources."no-case-3.0.4" @@ -66405,11 +64672,11 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.99.0" + sources."oo-ascii-tree-1.100.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -66418,6 +64685,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."possible-typed-array-names-1.0.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" sources."rechoir-0.6.2" @@ -66428,7 +64696,7 @@ in sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" @@ -66481,7 +64749,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."triple-beam-1.4.1" - sources."tslib-2.6.2" + 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" @@ -66491,6 +64759,7 @@ in sources."unbox-primitive-1.0.2" sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.11.0" sources."wcwidth-1.0.1" @@ -66502,22 +64771,25 @@ in sources."winston-3.13.0" sources."winston-transport-4.7.0" sources."workerpool-6.5.1" - sources."wrap-ansi-7.0.0" + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" - sources."yaml-2.4.3" + sources."yaml-2.4.5" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" sources."cliui-6.0.0" sources."decamelize-1.2.0" - sources."wrap-ansi-6.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."y18n-4.0.3" sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-21.1.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -66539,11 +64811,17 @@ in sha512 = "muEJhxWHZLv1Rayz2t7W3gP1zZbCE4DPFq3gNo4G667TzrwdY7XWreeze8Pj7i3mkQu+K492cSVdWBYKa3AJpg=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" + (sources."@alcalzone/ansi-tokenize-0.1.3" // { + dependencies = [ + sources."ansi-styles-6.2.1" + sources."is-fullwidth-code-point-4.0.0" + ]; + }) + sources."@babel/code-frame-7.24.7" sources."@babel/generator-7.24.4" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -66554,35 +64832,74 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.24.6" + sources."@babel/parser-7.24.7" sources."@babel/template-7.24.0" sources."@babel/types-7.24.0" - sources."@cdktf/cli-core-0.20.7" + (sources."@cdktf/cli-core-0.20.7" // { + dependencies = [ + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."auto-bind-4.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-truncate-2.1.0" + sources."code-excerpt-3.0.0" + sources."convert-to-spaces-1.0.2" + sources."indent-string-4.0.0" + sources."ink-3.2.0" + sources."lru-cache-6.0.0" + sources."patch-console-1.0.0" + sources."react-17.0.2" + sources."react-reconciler-0.26.2" + sources."restore-cursor-3.1.0" + sources."scheduler-0.20.2" + sources."semver-7.6.0" + sources."slice-ansi-3.0.0" + sources."type-fest-0.12.0" + sources."utf-8-validate-5.0.10" + sources."uuid-8.3.2" + sources."widest-line-3.1.0" + sources."wrap-ansi-6.2.0" + sources."ws-7.5.9" + ]; + }) (sources."@cdktf/commons-0.20.7" // { dependencies = [ + sources."@sentry-internal/tracing-7.109.0" + sources."@sentry/core-7.109.0" sources."@sentry/node-7.109.0" + sources."@sentry/types-7.109.0" + sources."@sentry/utils-7.109.0" sources."fs-extra-11.2.0" - sources."uuid-9.0.1" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" ]; }) sources."@cdktf/hcl-tools-0.20.7" (sources."@cdktf/hcl2cdk-0.20.7" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."camelcase-6.3.0" + sources."commonmark-0.31.0" + sources."entities-3.0.1" sources."glob-10.3.12" + sources."jsii-rosetta-5.3.28" sources."minimatch-9.0.4" + sources."string.prototype.repeat-1.0.0" ]; }) (sources."@cdktf/hcl2json-0.20.7" // { dependencies = [ sources."fs-extra-11.2.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" ]; }) sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" (sources."@cdktf/provider-generator-0.20.7" // { dependencies = [ - sources."@types/node-18.19.30" sources."brace-expansion-2.0.1" sources."glob-10.3.12" sources."minimatch-9.0.4" @@ -66591,49 +64908,82 @@ in (sources."@cdktf/provider-schema-0.20.7" // { dependencies = [ sources."fs-extra-11.2.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" ]; }) (sources."@inquirer/checkbox-1.5.2" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/confirm-2.0.17" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" + ]; + }) + (sources."@inquirer/core-2.3.1" // { + dependencies = [ + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) - sources."@inquirer/core-2.3.1" (sources."@inquirer/editor-1.2.15" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/expand-1.1.16" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/input-1.2.16" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/password-1.1.16" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) sources."@inquirer/prompts-2.3.1" @@ -66641,14 +64991,22 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/select-1.3.3" // { dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.2" + sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" + sources."type-fest-0.21.3" + sources."wrap-ansi-6.2.0" ]; }) sources."@inquirer/type-1.3.3" @@ -66668,24 +65026,17 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.25" sources."@jsii/check-node-1.95.0" - sources."@jsii/spec-1.99.0" + sources."@jsii/spec-1.100.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sentry-internal/tracing-7.109.0" - sources."@sentry/core-7.109.0" - (sources."@sentry/node-7.110.0" // { - dependencies = [ - sources."@sentry-internal/tracing-7.110.0" - sources."@sentry/core-7.110.0" - sources."@sentry/types-7.110.0" - sources."@sentry/utils-7.110.0" - ]; - }) - sources."@sentry/types-7.109.0" - sources."@sentry/utils-7.109.0" + sources."@sentry-internal/tracing-7.110.0" + sources."@sentry/core-7.110.0" + sources."@sentry/node-7.110.0" + sources."@sentry/types-7.110.0" + sources."@sentry/utils-7.110.0" sources."@types/mute-stream-0.0.1" - sources."@types/node-20.14.1" + sources."@types/node-18.19.30" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" sources."@types/wrap-ansi-3.0.0" @@ -66694,21 +65045,17 @@ in sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" sources."agent-base-6.0.2" - sources."ajv-8.15.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) + sources."ajv-8.16.0" + sources."ansi-escapes-7.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."archiver-5.3.2" (sources."archiver-utils-2.1.0" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) sources."arr-rotate-1.0.0" @@ -66717,7 +65064,7 @@ in sources."astral-regex-2.0.0" sources."async-3.2.5" sources."at-least-node-1.0.0" - sources."auto-bind-4.0.0" + sources."auto-bind-5.0.1" sources."available-typed-arrays-1.0.7" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -66729,7 +65076,7 @@ in sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.8" sources."call-bind-1.0.7" - sources."camelcase-5.3.1" + sources."camelcase-6.3.0" sources."case-1.6.3" sources."cdktf-0.20.7" sources."chalk-4.1.2" @@ -66737,28 +65084,38 @@ in sources."chokidar-3.6.0" sources."chownr-1.1.4" sources."ci-info-3.9.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" + sources."cli-boxes-3.0.0" + sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" - sources."cli-truncate-2.1.0" + (sources."cli-truncate-4.0.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-10.3.0" + sources."is-fullwidth-code-point-4.0.0" + sources."slice-ansi-5.0.0" + sources."string-width-7.1.0" + sources."strip-ansi-7.1.0" + ]; + }) sources."cli-width-4.1.0" - sources."cliui-6.0.0" + sources."cliui-8.0.1" sources."clone-2.1.2" - sources."code-excerpt-3.0.0" + sources."code-excerpt-4.0.0" (sources."codemaker-1.95.0" // { dependencies = [ - sources."camelcase-6.3.0" - sources."decamelize-5.0.1" sources."fs-extra-10.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" ]; }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commonmark-0.31.0" + sources."commonmark-0.30.0" sources."compress-commons-4.1.2" sources."concat-map-0.0.1" sources."constructs-10.1.167" - sources."convert-to-spaces-1.0.2" + sources."convert-to-spaces-2.0.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.3" @@ -66770,13 +65127,9 @@ in sources."data-view-byte-offset-1.0.0" sources."date-format-4.0.14" sources."debug-4.3.5" - sources."decamelize-1.2.0" + sources."decamelize-5.0.1" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.3" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + sources."deep-equal-2.2.3" sources."deep-extend-0.6.0" sources."deepmerge-4.3.1" sources."define-data-property-1.1.4" @@ -66787,26 +65140,19 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240604" + sources."typescript-5.6.0-dev.20240614" ]; }) sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."entities-3.0.1" + 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" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + 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" @@ -66815,7 +65161,11 @@ in sources."events-3.3.0" sources."execa-5.1.1" sources."expand-template-2.0.3" - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) (sources."extract-zip-2.0.1" // { dependencies = [ sources."get-stream-5.2.0" @@ -66823,7 +65173,6 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fast-uri-2.3.0" sources."fastq-1.17.1" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -66836,23 +65185,19 @@ in sources."flatted-3.3.1" sources."follow-redirects-1.15.6" sources."for-each-0.3.3" - (sources."foreground-child-3.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; }) sources."fs-constants-1.0.0" - (sources."fs-extra-8.1.0" // { - dependencies = [ - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) + 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" @@ -66877,16 +65222,49 @@ in sources."hasown-2.0.2" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."indent-string-4.0.0" + sources."indent-string-5.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."ink-3.2.0" + (sources."ink-5.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."chalk-5.3.0" + sources."emoji-regex-10.3.0" + sources."string-width-7.1.0" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-9.0.0" + ]; + }) (sources."ink-select-input-4.2.2" // { dependencies = [ + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."auto-bind-4.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-truncate-2.1.0" + sources."code-excerpt-3.0.0" + sources."convert-to-spaces-1.0.2" + sources."indent-string-4.0.0" + sources."ink-3.2.0" + sources."patch-console-1.0.0" sources."react-17.0.2" + sources."react-reconciler-0.26.2" + sources."restore-cursor-3.1.0" + sources."scheduler-0.20.2" + sources."slice-ansi-3.0.0" + sources."type-fest-0.12.0" + sources."utf-8-validate-5.0.10" + sources."widest-line-3.1.0" + sources."wrap-ansi-6.2.0" + sources."ws-7.5.9" ]; }) sources."ink-spinner-4.0.3" @@ -66913,6 +65291,7 @@ 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-map-2.0.3" sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" @@ -66929,7 +65308,7 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.3" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" @@ -66938,56 +65317,62 @@ in (sources."jsii-pacmak-1.95.0" // { dependencies = [ sources."cliui-7.0.4" - sources."commonmark-0.30.0" - sources."entities-2.0.3" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" - (sources."jsii-1.99.0" // { - dependencies = [ - sources."@jsii/check-node-1.99.0" - ]; - }) - (sources."jsii-rosetta-1.99.0" // { - dependencies = [ - sources."@jsii/check-node-1.99.0" - sources."commonmark-0.31.0" - sources."entities-3.0.1" - sources."string.prototype.repeat-1.0.0" - ]; - }) - sources."string.prototype.repeat-0.2.0" - sources."typescript-3.9.10" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.99.0" // { + (sources."jsii-reflect-1.100.0" // { dependencies = [ - sources."@jsii/check-node-1.99.0" + sources."@jsii/check-node-1.100.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + }) + (sources."jsii-rosetta-1.100.0" // { + dependencies = [ + sources."@jsii/check-node-1.100.0" + sources."cliui-7.0.4" + sources."commonmark-0.31.0" + sources."entities-3.0.1" + sources."fs-extra-10.1.0" + sources."jsii-1.100.0" + sources."jsonfile-6.1.0" + sources."string.prototype.repeat-1.0.0" + sources."typescript-3.9.10" + sources."universalify-2.0.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - sources."jsii-rosetta-5.3.28" (sources."jsii-srcmak-0.1.1039" // { dependencies = [ + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."decamelize-1.2.0" sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; }) sources."json-schema-traverse-1.0.0" - sources."jsonfile-6.1.0" + sources."jsonfile-4.0.0" (sources."lazystream-1.0.1" // { dependencies = [ + sources."isarray-1.0.0" sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) sources."locate-path-5.0.0" @@ -67000,7 +65385,7 @@ in sources."lodash.union-4.6.0" sources."log4js-6.9.1" sources."loose-envify-1.4.0" - sources."lru-cache-6.0.0" + sources."lru-cache-10.2.2" sources."mdurl-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -67017,10 +65402,10 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-1.0.0" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" sources."node-fetch-2.7.0" sources."node-gyp-build-4.8.1" sources."normalize-path-3.0.0" @@ -67034,23 +65419,19 @@ in sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.99.0" + sources."oo-ascii-tree-1.100.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-gitignore-1.0.1" - sources."patch-console-1.0.0" + sources."patch-console-2.0.0" sources."path-exists-4.0.0" 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" // { - dependencies = [ - sources."lru-cache-10.2.2" - ]; - }) + sources."path-scurry-1.11.1" sources."pend-1.2.0" sources."picocolors-1.0.1" sources."picomatch-2.3.1" @@ -67073,12 +65454,13 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-18.3.1" - sources."react-devtools-core-4.28.5" - (sources."react-reconciler-0.26.2" // { + (sources."react-devtools-core-4.28.5" // { dependencies = [ - sources."react-17.0.2" + sources."utf-8-validate-5.0.10" + sources."ws-7.5.9" ]; }) + sources."react-reconciler-0.29.2" sources."readable-stream-3.6.2" sources."readdir-glob-1.1.3" sources."readdirp-3.6.0" @@ -67089,22 +65471,18 @@ in sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" sources."resolve-1.22.8" - sources."restore-cursor-3.1.0" + sources."restore-cursor-4.0.0" sources."reusify-1.0.4" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."run-async-3.0.0" sources."run-parallel-1.2.0" - (sources."safe-array-concat-1.1.2" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + 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.20.2" - sources."semver-7.6.0" + sources."scheduler-0.23.2" + sources."semver-7.6.2" (sources."semver-intersect-1.5.0" // { dependencies = [ sources."semver-6.3.1" @@ -67121,7 +65499,12 @@ in sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."slice-ansi-3.0.0" + (sources."slice-ansi-7.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + sources."is-fullwidth-code-point-5.0.0" + ]; + }) sources."sort-json-2.0.1" sources."spdx-license-list-6.9.0" sources."sscaff-1.2.274" @@ -67133,11 +65516,15 @@ in sources."streamroller-3.1.5" sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" - sources."string.prototype.repeat-1.0.0" + 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.3.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" sources."strip-ansi-cjs-6.0.1" sources."strip-final-newline-2.0.0" @@ -67151,7 +65538,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" - sources."type-fest-0.12.0" + sources."type-fest-4.20.0" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" @@ -67159,10 +65546,11 @@ in sources."typescript-5.3.3" sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" - sources."universalify-2.0.1" - sources."utf-8-validate-5.0.10" + sources."universalify-0.1.2" + sources."uri-js-4.4.1" + sources."utf-8-validate-6.0.4" sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" + sources."uuid-9.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" @@ -67170,28 +65558,29 @@ in sources."which-collection-1.0.2" sources."which-module-2.0.1" sources."which-typed-array-1.1.15" - sources."widest-line-3.1.0" + (sources."widest-line-5.0.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-10.3.0" + sources."string-width-7.1.0" + sources."strip-ansi-7.1.0" + ]; + }) sources."workerpool-6.5.1" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-8.17.0" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" sources."xstate-4.38.3" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.7.2" // { - dependencies = [ - sources."cliui-8.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-parser-21.1.1" - ]; - }) - sources."yargs-parser-18.1.3" + sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" sources."yoga-layout-prebuilt-1.10.0" + sources."yoga-wasm-web-0.3.3" (sources."zip-stream-4.1.1" // { dependencies = [ sources."archiver-utils-3.0.4" @@ -67260,10 +65649,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.30.2"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.30.2.tgz"; - sha512 = "3ctQTOGa0f1EnvDmUyOr5Rrm9t10MK6nRQ9rnFefdNPFeAPfp9L6Puu3DDXB/YpKbeMqNWnQnVUPI3F65+kqfQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.31.0.tgz"; + sha512 = "4t6rVLxFrHp5L8/fSGMG1A4UEnAa41JwwczOBTnETOVQI9vYVL+PkXHCnYtx0e+yJZyCizpj/9IsbSPSDVmzag=="; }; buildInputs = globalBuildInputs; meta = { @@ -67341,7 +65730,7 @@ in sources."dockerfile-language-server-nodejs-0.9.0" sources."dockerfile-language-service-0.9.0" sources."dockerfile-utils-0.10.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" (sources."vscode-languageserver-protocol-3.17.3" // { @@ -67406,10 +65795,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.26.7"; + version = "0.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.7.tgz"; - sha512 = "+4pUYRje1K9/I9lm1r36LqDj8KDO9XojZdylMV3BwcUFarJw1HHElO/WA5ZyfsUQT8VNBgTEEvXCk6FBFCcmPA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.27.2.tgz"; + sha512 = "uwy/RckeCGUU2pook/LADo/czly2ZyAUTB6GfIZK+DByaS7kmpuyapwnfD3BC5B+vOLqi+5JjrunCf4ts5McEg=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -67530,7 +65919,7 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.8" sources."which-3.0.1" @@ -67903,7 +66292,7 @@ in }) sources."regexp.prototype.flags-1.5.2" sources."rfc-3986-1.0.1" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."rimraf-3.0.2" sources."safe-array-concat-1.1.2" sources."safe-buffer-5.2.1" @@ -67932,7 +66321,7 @@ in sources."tar-6.2.1" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" @@ -68016,7 +66405,7 @@ in sha512 = "rADFFHjr8CBjZDKMfuyXLIeUelah3ZTxQTHEWatQwnrS9WW/Xj6goJO/8z06zjjvX2oVhJypDXbnjd5CJB0f1A=="; }; dependencies = [ - sources."pyright-1.1.365" + sources."pyright-1.1.367" ]; buildInputs = globalBuildInputs; meta = { @@ -68108,18 +66497,23 @@ in coc-sh = nodeEnv.buildNodePackage { name = "coc-sh"; packageName = "coc-sh"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.2.2.tgz"; - sha512 = "3aaCl62MAgDWDZ4McFobb4NcvHkg0XPsvDffZ7Ej6C7RUgSwPF9xJTGNjP+2KptIEm9o4H7TbBcxX7944+p2fQ=="; + url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.2.4.tgz"; + sha512 = "J3m8OBmy09MUSUYFdnnpN1MoC0diZsN+CebXJC/YtI70UqptUuNyDzbtROTiG8J+dUjuPEUi1VS+r21Ap4h0Hg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."bash-language-server-5.3.4" + sources."@one-ini/wasm-0.1.1" + sources."balanced-match-1.0.2" + sources."bash-language-server-5.4.0" + sources."brace-expansion-2.0.1" sources."braces-3.0.3" + sources."commander-11.1.0" sources."domino-2.1.6" + sources."editorconfig-2.0.0" sources."encoding-0.1.13" sources."fast-glob-3.3.2" sources."fastq-1.17.1" @@ -68132,15 +66526,17 @@ in sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.7" + sources."minimatch-9.0.2" sources."node-fetch-2.7.0" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" + sources."semver-7.6.2" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."turndown-7.1.3" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -68359,31 +66755,31 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - sources."@babel/core-7.24.6" - sources."@babel/generator-7.24.6" - sources."@babel/helper-compilation-targets-7.24.6" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + sources."@babel/core-7.24.7" + sources."@babel/generator-7.24.7" + sources."@babel/helper-compilation-targets-7.24.7" + 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.7" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/parser-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -68399,7 +66795,7 @@ in sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" sources."@types/unist-2.0.10" - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -68418,11 +66814,11 @@ in ]; }) sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -68459,7 +66855,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68470,7 +66866,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" - sources."fast-uri-2.3.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" @@ -68601,6 +66996,7 @@ in sources."postcss-selector-parser-6.1.0" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -68667,6 +67063,7 @@ in sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."update-browserslist-db-1.0.16" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.4.0" sources."validate-npm-package-license-3.0.4" @@ -68708,7 +67105,7 @@ in sha512 = "elUmSurb51E17VV/1W/qsAoD5qq6pFsnRK549WFMcG+AThli6nTj2Y6Ta0FA6+zh7QSjbraOlza8gk7C2w3Nfg=="; }; dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; buildInputs = globalBuildInputs; meta = { @@ -68813,9 +67210,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -68949,8 +67346,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -69024,7 +67421,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-uri-2.3.0" sources."file-entry-cache-6.0.1" sources."flat-cache-3.2.0" sources."flatted-3.3.1" @@ -69101,7 +67497,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.2" // { dependencies = [ - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -69420,7 +67816,7 @@ in sha512 = "1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg=="; }; dependencies = [ - sources."@babel/runtime-7.24.6" + sources."@babel/runtime-7.24.7" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" (sources."chalk-4.1.2" // { @@ -69447,7 +67843,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-8.1.1" sources."tree-kill-1.2.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.7.2" @@ -69472,9 +67868,9 @@ in sha512 = "9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" sources."@conventional-changelog/git-client-1.0.1" sources."@hutson/parse-repository-url-5.0.0" sources."@types/normalize-package-data-2.4.4" @@ -69533,8 +67929,8 @@ in sources."supports-color-5.5.0" sources."temp-dir-3.0.0" sources."tempfile-5.0.0" - sources."type-fest-4.19.0" - sources."uglify-js-3.17.4" + sources."type-fest-4.20.0" + sources."uglify-js-3.18.0" sources."unicorn-magic-0.1.0" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -69630,7 +68026,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.1" + sources."@types/node-20.14.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -69816,12 +68212,12 @@ in sources."@cspell/dict-aws-4.0.2" sources."@cspell/dict-bash-4.1.3" sources."@cspell/dict-companies-3.1.2" - sources."@cspell/dict-cpp-5.1.8" + sources."@cspell/dict-cpp-5.1.9" 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-data-science-1.0.11" + 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" @@ -69840,7 +68236,7 @@ in sources."@cspell/dict-haskell-4.0.1" sources."@cspell/dict-html-4.0.5" sources."@cspell/dict-html-symbol-entities-4.0.0" - sources."@cspell/dict-java-5.0.6" + sources."@cspell/dict-java-5.0.7" sources."@cspell/dict-julia-1.0.1" sources."@cspell/dict-k8s-1.0.5" sources."@cspell/dict-latex-4.0.0" @@ -69850,15 +68246,15 @@ in sources."@cspell/dict-monkeyc-1.0.6" sources."@cspell/dict-node-5.0.1" sources."@cspell/dict-npm-5.0.16" - sources."@cspell/dict-php-4.0.7" + sources."@cspell/dict-php-4.0.8" sources."@cspell/dict-powershell-5.0.4" sources."@cspell/dict-public-licenses-2.0.7" - sources."@cspell/dict-python-4.1.11" + sources."@cspell/dict-python-4.2.1" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-5.0.2" - sources."@cspell/dict-rust-4.0.3" + sources."@cspell/dict-rust-4.0.4" sources."@cspell/dict-scala-5.0.2" - sources."@cspell/dict-software-terms-3.4.1" + sources."@cspell/dict-software-terms-3.4.6" sources."@cspell/dict-sql-2.1.3" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" @@ -69932,7 +68328,7 @@ in sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.8" sources."xdg-basedir-5.1.0" - sources."yaml-2.4.3" + sources."yaml-2.4.5" ]; buildInputs = globalBuildInputs; meta = { @@ -69987,92 +68383,6 @@ in bypassCache = true; reconstructLock = true; }; - diagnostic-languageserver = nodeEnv.buildNodePackage { - name = "diagnostic-languageserver"; - packageName = "diagnostic-languageserver"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.15.0.tgz"; - sha512 = "B1kH0j0jOd106t5E14xItYazxFAYOsAvhK+e0+eYW3nOzG3saKFXfkoeJ86T8g2U40lIwo0Jt8xusn8gd34Swg=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."aggregate-error-3.1.0" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."clean-stack-2.2.0" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."crypto-random-string-2.0.0" - sources."del-6.1.1" - sources."dir-glob-3.0.1" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."ignore-5.3.1" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-stream-2.0.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."slash-3.0.0" - sources."temp-dir-2.0.0" - sources."tempy-0.7.1" - sources."to-regex-range-5.0.1" - sources."tslib-1.14.1" - sources."type-fest-0.16.0" - sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-6.1.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-2.1.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "diagnostic language server"; - homepage = "https://github.com/iamcco/diagnostic-languageserver#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; diff2html-cli = nodeEnv.buildNodePackage { name = "diff2html-cli"; packageName = "diff2html-cli"; @@ -70153,35 +68463,6 @@ in bypassCache = true; reconstructLock = true; }; - dotenv-cli = nodeEnv.buildNodePackage { - name = "dotenv-cli"; - packageName = "dotenv-cli"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.2.tgz"; - sha512 = "SbUj8l61zIbzyhIbg0FwPJq6+wjbzdn9oEtozQpZ6kW2ihCcapKVZj49oCT3oPM+mgQm+itgvUQcG5szxVrZTA=="; - }; - dependencies = [ - sources."cross-spawn-7.0.3" - sources."dotenv-16.4.5" - sources."dotenv-expand-10.0.0" - sources."isexe-2.0.0" - sources."minimist-1.2.8" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A global executable to run applications with the ENV variables loaded by dotenv"; - homepage = "https://github.com/entropitor/dotenv-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; @@ -70221,19 +68502,19 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.5" - sources."@types/node-20.14.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -70406,7 +68687,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."ts-node-10.9.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typescript-5.4.5" @@ -70692,7 +68973,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.1" + sources."@types/node-20.14.2" sources."@types/responselike-1.0.3" sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" @@ -70940,7 +69221,7 @@ in sources."ms-2.0.0" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" sources."node-api-version-0.2.0" sources."node-fetch-2.7.0" sources."node-gyp-9.4.1" @@ -71026,7 +69307,7 @@ in sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."rimraf-3.0.2" sources."roarr-2.15.4" sources."run-parallel-1.2.0" @@ -71120,18 +69401,23 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "9.1.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-9.1.0.tgz"; - sha512 = "7EGU8fxXb/KZFo/msiJSTfHrok2+0HMv//TTpaVNQkbe1HKuNN+Zcgt22jCRIn4z5I26OiMR79j6psBgTm1BHg=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.0.0.tgz"; + sha512 = "N0s3BcFHBTOKYST7bzPvcMa7cGA7B7hDTOh+NgfkPB6qavGPgSFwbQo8c8BHFXI1iWw8vvjhh24/OEt06dFjOw=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.7" sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) (sources."@cspotcode/source-map-support-0.8.1" // { @@ -71155,24 +69441,43 @@ in dependencies = [ sources."@expo/json-file-8.3.3" sources."@expo/plist-0.1.3" + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + 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.114" - (sources."@expo/eas-json-9.0.8" // { + (sources."@expo/eas-build-job-1.0.117" // { + dependencies = [ + sources."joi-17.13.1" + sources."semver-7.6.2" + ]; + }) + (sources."@expo/eas-json-10.0.0" // { dependencies = [ (sources."@babel/code-frame-7.23.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."semver-7.5.2" + sources."supports-color-5.5.0" sources."tslib-2.4.1" ]; }) (sources."@expo/fingerprint-0.6.1" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."find-up-5.0.0" + 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/image-utils-0.4.2" // { @@ -71193,30 +69498,29 @@ in ]; }) sources."@expo/json-file-8.2.37" - sources."@expo/logger-1.0.57" + sources."@expo/logger-1.0.117" sources."@expo/multipart-body-parser-1.1.0" sources."@expo/osascript-2.0.33" - sources."@expo/package-manager-1.1.2" + (sources."@expo/package-manager-1.1.2" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) sources."@expo/pkcs12-0.0.8" sources."@expo/plist-0.0.20" (sources."@expo/plugin-help-5.1.23" // { dependencies = [ sources."@oclif/core-2.16.0" - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) (sources."@expo/plugin-warn-if-update-available-2.5.1" // { dependencies = [ sources."@oclif/core-2.16.0" - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."fs-extra-10.1.0" - sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) @@ -71234,10 +69538,10 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.7.0" - (sources."@expo/steps-1.0.114" // { + (sources."@expo/steps-1.0.117" // { dependencies = [ sources."@expo/spawn-async-1.7.2" - sources."arg-5.0.2" + sources."joi-17.13.1" ]; }) sources."@expo/timeago.js-1.0.0" @@ -71253,11 +69557,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/core-1.26.2" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."fs-extra-9.1.0" - sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) @@ -71265,10 +69565,6 @@ in (sources."@oclif/plugin-autocomplete-2.3.10" // { dependencies = [ sources."@oclif/core-2.16.0" - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) @@ -71279,32 +69575,32 @@ in sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@swc/core-1.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.5" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.7.13" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."agent-base-6.0.2" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."arg-4.1.3" + sources."arg-5.0.2" sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asn1-0.2.6" @@ -71318,21 +69614,13 @@ in sources."big-integer-1.6.52" sources."bplist-creator-0.1.1" sources."bplist-parser-0.3.2" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."buffer-equal-constant-time-1.0.1" sources."builtins-1.0.3" sources."bunyan-1.8.15" sources."cardinal-2.1.1" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."chalk-4.1.2" sources."charenc-0.0.2" sources."chownr-2.0.0" (sources."clean-stack-3.0.1" // { @@ -71344,8 +69632,8 @@ in sources."cli-progress-3.12.0" sources."cli-spinners-2.9.2" sources."clone-1.0.4" - 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."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-type-1.2.2" @@ -71381,7 +69669,11 @@ in (sources."expo-modules-autolinking-1.11.1" // { dependencies = [ sources."commander-7.2.0" + sources."find-up-5.0.0" sources."fs-extra-9.1.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" ]; }) sources."fast-deep-equal-3.1.3" @@ -71391,7 +69683,7 @@ in sources."figures-3.2.0" sources."filelist-1.0.4" sources."fill-range-7.1.1" - sources."find-up-5.0.0" + sources."find-up-4.1.0" sources."find-yarn-workspace-root-2.0.0" sources."form-data-4.0.0" sources."fs-extra-11.2.0" @@ -71405,6 +69697,7 @@ in sources."getenv-1.0.0" (sources."glob-7.1.6" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) @@ -71415,7 +69708,7 @@ in sources."gradle-to-js-2.0.1" sources."graphql-16.8.1" sources."graphql-tag-2.12.6" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."hosted-git-info-3.0.8" sources."http-call-5.3.0" sources."https-proxy-agent-5.0.1" @@ -71441,6 +69734,7 @@ in sources."isexe-2.0.0" (sources."jake-10.9.1" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) @@ -71461,7 +69755,7 @@ in sources."keychain-1.5.0" sources."kleur-3.0.3" sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -71476,11 +69770,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - (sources."minimatch-5.1.2" // { - dependencies = [ - sources."brace-expansion-2.0.1" - ]; - }) + sources."minimatch-5.1.2" sources."minimist-1.2.8" sources."minipass-5.0.0" (sources."minizlib-2.1.2" // { @@ -71488,13 +69778,17 @@ in sources."minipass-3.3.6" ]; }) - sources."mkdirp-0.5.6" + sources."mkdirp-1.0.4" sources."moment-2.30.1" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."mv-2.1.1" + (sources."mv-2.1.1" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) sources."mz-2.7.0" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."nanoid-3.3.4" sources."natural-orderby-2.0.3" sources."ncp-2.0.0" @@ -71518,8 +69812,8 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" (sources."parse-png-2.1.0" // { @@ -71535,14 +69829,7 @@ in sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."pirates-4.0.6" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - 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."pkg-dir-4.2.0" (sources."plist-3.1.0" // { dependencies = [ sources."@xmldom/xmldom-0.8.10" @@ -71565,6 +69852,7 @@ in 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" ]; @@ -71581,13 +69869,7 @@ in sources."simple-plist-1.4.0" sources."sisteransi-1.0.5" sources."slash-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."slice-ansi-4.0.0" sources."slugify-1.6.6" sources."split-1.0.1" sources."sprintf-js-1.0.3" @@ -71598,18 +69880,9 @@ in sources."structured-headers-0.4.1" sources."sucrase-3.34.0" sources."sudo-prompt-9.1.1" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-2.3.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."tar-6.2.1" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.3.0" + sources."tar-6.2.1" sources."temp-dir-1.0.0" (sources."tempy-0.3.0" // { dependencies = [ @@ -71624,7 +69897,11 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-interface-checker-0.1.13" - sources."ts-node-10.9.2" + (sources."ts-node-10.9.2" // { + dependencies = [ + sources."arg-4.1.3" + ]; + }) sources."tslib-2.6.2" sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" @@ -71645,13 +69922,7 @@ in sources."widest-line-3.1.0" sources."wonka-6.3.4" sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" (sources."xcode-3.0.1" // { @@ -71666,7 +69937,7 @@ in }) sources."xmlbuilder-14.0.0" sources."yallist-4.0.0" - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" sources."yocto-queue-0.1.0" sources."zod-3.23.8" @@ -71711,7 +69982,7 @@ in sources."@alcalzone/ansi-tokenize-0.1.3" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."ajv-formats-2.1.1" sources."ansi-escapes-7.0.0" sources."ansi-regex-6.0.1" @@ -71742,7 +70013,6 @@ in sources."escape-string-regexp-2.0.0" sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" - sources."fast-uri-2.3.0" sources."get-east-asian-width-1.2.0" sources."get-stream-8.0.1" sources."human-signals-5.0.0" @@ -71750,12 +70020,12 @@ in (sources."ink-5.0.1" // { dependencies = [ sources."signal-exit-3.0.7" - sources."type-fest-4.19.0" + sources."type-fest-4.20.0" ]; }) (sources."ink-text-input-6.0.0" // { dependencies = [ - sources."type-fest-4.19.0" + sources."type-fest-4.20.0" ]; }) sources."is-docker-3.0.0" @@ -71786,6 +70056,7 @@ in sources."p-defer-1.0.0" sources."patch-console-2.0.0" sources."path-key-3.1.1" + sources."punycode-2.3.1" sources."react-18.3.1" (sources."react-devtools-core-4.28.5" // { dependencies = [ @@ -71823,6 +70094,7 @@ in sources."type-fest-3.13.1" sources."uint8array-extras-0.3.0" sources."unicode-emoji-json-0.6.0" + sources."uri-js-4.4.1" sources."utf-8-validate-6.0.4" sources."when-exit-2.1.2" sources."which-2.0.2" @@ -71879,10 +70151,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.4.0.tgz"; - sha512 = "sjc7Y8cUD1IlwYcTS9qPSvGjAC8Ne9LctpxKKu3x/1IC9bnOg98Zy6GxEJUfr1NojMgVPlyANXYns8oE2c1TAA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz"; + sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw=="; }; dependencies = [ (sources."@eslint-community/eslint-utils-4.4.0" // { @@ -71891,16 +70163,16 @@ in ]; }) sources."@eslint-community/regexpp-4.10.1" - sources."@eslint/config-array-0.15.1" + sources."@eslint/config-array-0.16.0" sources."@eslint/eslintrc-3.1.0" - sources."@eslint/js-9.4.0" - sources."@eslint/object-schema-2.1.3" + sources."@eslint/js-9.5.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.11.3" + sources."acorn-8.12.0" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -71917,7 +70189,7 @@ in sources."debug-4.3.5" sources."deep-is-0.1.4" sources."escape-string-regexp-4.0.0" - sources."eslint-9.4.0" + sources."eslint-9.5.0" sources."eslint-scope-8.0.1" sources."eslint-visitor-keys-4.0.0" sources."espree-10.0.1" @@ -72016,67 +70288,67 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { dependencies = [ - sources."@babel/code-frame-7.24.6" + sources."@babel/code-frame-7.24.7" sources."json5-2.2.3" sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.6" - sources."@babel/helper-annotate-as-pure-7.24.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/generator-7.24.7" + 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.7" // { 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.6" // { + (sources."@babel/helper-create-class-features-plugin-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.24.6" // { + (sources."@babel/helper-create-regexp-features-plugin-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) sources."@babel/helper-define-polyfill-provider-0.6.2" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-member-expression-to-functions-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-optimise-call-expression-7.24.6" - sources."@babel/helper-plugin-utils-7.24.6" - sources."@babel/helper-remap-async-to-generator-7.24.6" - sources."@babel/helper-replace-supers-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helper-wrap-function-7.24.6" - sources."@babel/helpers-7.24.6" - (sources."@babel/highlight-7.24.6" // { + 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.7" + sources."@babel/helper-module-imports-7.24.7" + sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-remap-async-to-generator-7.24.7" + sources."@babel/helper-replace-supers-7.24.7" + 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.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helper-wrap-function-7.24.7" + sources."@babel/helpers-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.6" - sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6" - sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6" + sources."@babel/parser-7.24.7" + 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/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-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-decorators-7.24.6" - sources."@babel/plugin-proposal-export-default-from-7.24.6" + sources."@babel/plugin-proposal-decorators-7.24.7" + sources."@babel/plugin-proposal-export-default-from-7.24.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" @@ -72085,16 +70357,16 @@ in sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.24.6" + sources."@babel/plugin-syntax-decorators-7.24.7" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.24.6" + 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.6" - sources."@babel/plugin-syntax-import-assertions-7.24.6" - sources."@babel/plugin-syntax-import-attributes-7.24.6" + 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-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.24.6" + sources."@babel/plugin-syntax-jsx-7.24.7" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -72103,68 +70375,68 @@ 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.6" + sources."@babel/plugin-syntax-typescript-7.24.7" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.24.6" - sources."@babel/plugin-transform-async-generator-functions-7.24.6" - sources."@babel/plugin-transform-async-to-generator-7.24.6" - sources."@babel/plugin-transform-block-scoped-functions-7.24.6" - sources."@babel/plugin-transform-block-scoping-7.24.6" - sources."@babel/plugin-transform-class-properties-7.24.6" - sources."@babel/plugin-transform-class-static-block-7.24.6" - sources."@babel/plugin-transform-classes-7.24.6" - sources."@babel/plugin-transform-computed-properties-7.24.6" - sources."@babel/plugin-transform-destructuring-7.24.6" - sources."@babel/plugin-transform-dotall-regex-7.24.6" - sources."@babel/plugin-transform-duplicate-keys-7.24.6" - sources."@babel/plugin-transform-dynamic-import-7.24.6" - sources."@babel/plugin-transform-exponentiation-operator-7.24.6" - sources."@babel/plugin-transform-export-namespace-from-7.24.6" - sources."@babel/plugin-transform-flow-strip-types-7.24.6" - sources."@babel/plugin-transform-for-of-7.24.6" - sources."@babel/plugin-transform-function-name-7.24.6" - sources."@babel/plugin-transform-json-strings-7.24.6" - sources."@babel/plugin-transform-literals-7.24.6" - sources."@babel/plugin-transform-logical-assignment-operators-7.24.6" - sources."@babel/plugin-transform-member-expression-literals-7.24.6" - sources."@babel/plugin-transform-modules-amd-7.24.6" - sources."@babel/plugin-transform-modules-commonjs-7.24.6" - sources."@babel/plugin-transform-modules-systemjs-7.24.6" - sources."@babel/plugin-transform-modules-umd-7.24.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.6" - sources."@babel/plugin-transform-new-target-7.24.6" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.24.6" - sources."@babel/plugin-transform-numeric-separator-7.24.6" - sources."@babel/plugin-transform-object-rest-spread-7.24.6" - sources."@babel/plugin-transform-object-super-7.24.6" - sources."@babel/plugin-transform-optional-catch-binding-7.24.6" - sources."@babel/plugin-transform-optional-chaining-7.24.6" - sources."@babel/plugin-transform-parameters-7.24.6" - sources."@babel/plugin-transform-private-methods-7.24.6" - sources."@babel/plugin-transform-private-property-in-object-7.24.6" - sources."@babel/plugin-transform-property-literals-7.24.6" - sources."@babel/plugin-transform-react-display-name-7.24.6" - sources."@babel/plugin-transform-react-jsx-7.24.6" - sources."@babel/plugin-transform-react-jsx-self-7.24.6" - sources."@babel/plugin-transform-react-jsx-source-7.24.6" - sources."@babel/plugin-transform-regenerator-7.24.6" - sources."@babel/plugin-transform-reserved-words-7.24.6" - (sources."@babel/plugin-transform-runtime-7.24.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-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-class-static-block-7.24.7" + sources."@babel/plugin-transform-classes-7.24.7" + sources."@babel/plugin-transform-computed-properties-7.24.7" + sources."@babel/plugin-transform-destructuring-7.24.7" + sources."@babel/plugin-transform-dotall-regex-7.24.7" + sources."@babel/plugin-transform-duplicate-keys-7.24.7" + 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-for-of-7.24.7" + sources."@babel/plugin-transform-function-name-7.24.7" + sources."@babel/plugin-transform-json-strings-7.24.7" + sources."@babel/plugin-transform-literals-7.24.7" + 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.7" + sources."@babel/plugin-transform-modules-systemjs-7.24.7" + 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-nullish-coalescing-operator-7.24.7" + sources."@babel/plugin-transform-numeric-separator-7.24.7" + sources."@babel/plugin-transform-object-rest-spread-7.24.7" + sources."@babel/plugin-transform-object-super-7.24.7" + sources."@babel/plugin-transform-optional-catch-binding-7.24.7" + sources."@babel/plugin-transform-optional-chaining-7.24.7" + sources."@babel/plugin-transform-parameters-7.24.7" + sources."@babel/plugin-transform-private-methods-7.24.7" + 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-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" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.24.6" - sources."@babel/plugin-transform-spread-7.24.6" - sources."@babel/plugin-transform-sticky-regex-7.24.6" - sources."@babel/plugin-transform-template-literals-7.24.6" - sources."@babel/plugin-transform-typeof-symbol-7.24.6" - sources."@babel/plugin-transform-typescript-7.24.6" - sources."@babel/plugin-transform-unicode-escapes-7.24.6" - sources."@babel/plugin-transform-unicode-property-regex-7.24.6" - sources."@babel/plugin-transform-unicode-regex-7.24.6" - sources."@babel/plugin-transform-unicode-sets-regex-7.24.6" - (sources."@babel/preset-env-7.24.6" // { + 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.7" + sources."@babel/plugin-transform-typescript-7.24.7" + 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.7" // { dependencies = [ sources."semver-6.3.1" ]; @@ -72172,22 +70444,22 @@ in sources."@babel/preset-modules-0.1.6-no-external-plugins" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.9.0" - (sources."@babel/template-7.24.6" // { + (sources."@babel/template-7.24.7" // { dependencies = [ - sources."@babel/code-frame-7.24.6" + sources."@babel/code-frame-7.24.7" ]; }) - (sources."@babel/traverse-7.24.6" // { + (sources."@babel/traverse-7.24.7" // { dependencies = [ - sources."@babel/code-frame-7.24.6" + sources."@babel/code-frame-7.24.7" ]; }) - sources."@babel/types-7.24.6" + sources."@babel/types-7.24.7" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.7.3" // { dependencies = [ - sources."@babel/runtime-7.24.6" + sources."@babel/runtime-7.24.7" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -72266,7 +70538,9 @@ in dependencies = [ sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" + sources."@xmldom/xmldom-0.7.13" sources."semver-7.6.2" + sources."xmlbuilder-14.0.0" ]; }) sources."@expo/config-types-45.0.0" @@ -72308,7 +70582,12 @@ in sources."semver-5.7.2" ]; }) - sources."@expo/plist-0.0.20" + (sources."@expo/plist-0.0.20" // { + dependencies = [ + sources."@xmldom/xmldom-0.7.13" + sources."xmlbuilder-14.0.0" + ]; + }) (sources."@expo/prebuild-config-4.0.3" // { dependencies = [ sources."@expo/json-file-8.2.36" @@ -72376,17 +70655,8 @@ in ]; }) sources."@react-native/normalize-color-2.1.0" - sources."@rspack/binding-0.7.0" - sources."@rspack/binding-darwin-arm64-0.7.0" - sources."@rspack/binding-darwin-x64-0.7.0" - sources."@rspack/binding-linux-arm64-gnu-0.7.0" - sources."@rspack/binding-linux-arm64-musl-0.7.0" - sources."@rspack/binding-linux-x64-gnu-0.7.0" - sources."@rspack/binding-linux-x64-musl-0.7.0" - sources."@rspack/binding-win32-arm64-msvc-0.7.0" - sources."@rspack/binding-win32-ia32-msvc-0.7.0" - sources."@rspack/binding-win32-x64-msvc-0.7.0" - sources."@rspack/core-0.7.0" + sources."@rspack/binding-0.7.3" + sources."@rspack/core-0.7.3" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" @@ -72417,7 +70687,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.15" sources."@types/range-parser-1.2.7" @@ -72447,16 +70717,16 @@ in sources."@webassemblyjs/wasm-opt-1.12.1" sources."@webassemblyjs/wasm-parser-1.12.1" sources."@webassemblyjs/wast-printer-1.12.1" - sources."@xmldom/xmldom-0.7.13" + sources."@xmldom/xmldom-0.8.10" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.11.3" - sources."acorn-import-assertions-1.9.0" + sources."acorn-8.12.0" + sources."acorn-import-attributes-1.9.5" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.15.0" + sources."ajv-8.16.0" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -72533,7 +70803,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -72555,7 +70825,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72703,7 +70973,7 @@ in sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -72713,7 +70983,7 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.16.1" + sources."enhanced-resolve-5.17.0" sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" @@ -72754,7 +71024,7 @@ in }) (sources."expo-48.0.21" // { dependencies = [ - sources."@babel/runtime-7.24.6" + sources."@babel/runtime-7.24.7" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -72848,7 +71118,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fast-uri-2.3.0" sources."fastq-1.17.1" sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" @@ -72875,7 +71144,7 @@ in sources."follow-redirects-1.15.6" sources."fontfaceobserver-2.3.0" sources."for-each-0.3.3" - (sources."foreground-child-3.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -73026,7 +71295,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" @@ -73257,12 +71526,7 @@ in sources."path-exists-3.0.0" ]; }) - (sources."plist-3.1.0" // { - dependencies = [ - sources."@xmldom/xmldom-0.8.10" - sources."xmlbuilder-15.1.1" - ]; - }) + sources."plist-3.1.0" sources."pngjs-3.4.0" sources."possible-typed-array-names-1.0.0" sources."postcss-8.4.38" @@ -73560,7 +71824,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.31.0" // { + (sources."terser-5.31.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -73587,7 +71851,7 @@ in sources."traverse-0.6.9" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."turndown-7.0.0" sources."type-fest-0.12.0" sources."type-is-1.6.18" @@ -73632,7 +71896,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.91.0" // { + (sources."webpack-5.92.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -73727,7 +71991,7 @@ in sources."xmlbuilder-11.0.1" ]; }) - sources."xmlbuilder-14.0.0" + sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yocto-queue-0.1.0" @@ -73752,18 +72016,22 @@ in }; dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - sources."@puppeteer/browsers-2.2.3" + (sources."@puppeteer/browsers-2.2.3" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" sources."@types/yauzl-2.10.3" @@ -73782,7 +72050,7 @@ in sources."bufferutil-4.0.8" sources."callsites-3.1.0" sources."chalk-5.3.0" - sources."chromium-bidi-0.5.19" + sources."chromium-bidi-0.5.23" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" @@ -73811,9 +72079,9 @@ in sources."cosmiconfig-9.0.0" sources."csstype-3.1.3" sources."data-uri-to-buffer-6.0.2" - sources."debug-4.3.4" + sources."debug-4.3.5" sources."degenerator-5.0.1" - sources."devtools-protocol-0.0.1286932" + sources."devtools-protocol-0.0.1299070" sources."emoji-regex-10.3.0" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" @@ -73874,8 +72142,8 @@ in sources."proxy-agent-6.4.0" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-22.10.0" - sources."puppeteer-core-22.10.0" + sources."puppeteer-22.11.0" + sources."puppeteer-core-22.11.0" sources."queue-tick-1.0.1" sources."react-18.3.1" (sources."react-devtools-core-4.28.5" // { @@ -73915,8 +72183,8 @@ in sources."tar-stream-3.1.7" sources."text-decoder-1.1.0" sources."through-2.3.8" - sources."tslib-2.6.2" - sources."type-fest-4.19.0" + sources."tslib-2.6.3" + sources."type-fest-4.20.0" sources."typescript-5.4.5" sources."unbzip2-stream-1.4.3" sources."undici-types-5.26.5" @@ -73942,7 +72210,7 @@ in sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" sources."yoga-wasm-web-0.3.3" - sources."zod-3.22.4" + sources."zod-3.23.8" ]; buildInputs = globalBuildInputs; meta = { @@ -73999,21 +72267,21 @@ in sources."@oclif/plugin-help-5.2.20" sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" - sources."@swc/core-1.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.5" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/wrap-ansi-3.0.0" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -74251,7 +72519,7 @@ in sources."tr46-0.0.3" sources."treeify-1.1.0" sources."ts-node-10.9.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" @@ -74281,55 +72549,6 @@ in bypassCache = true; reconstructLock = true; }; - fixjson = nodeEnv.buildNodePackage { - name = "fixjson"; - packageName = "fixjson"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.2.tgz"; - sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."detect-indent-6.1.0" - sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."json5-relaxed-0.5.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."y18n-5.0.8" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON fixer for humans using (relaxed) JSON5"; - homepage = "https://github.com/rhysd/fixjson#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; @@ -74474,7 +72693,7 @@ in ]; }) sources."tmp-0.0.33" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" @@ -74511,14 +72730,14 @@ in dependencies = [ sources."@ethereumjs/rlp-4.0.1" sources."@ethereumjs/util-8.1.0" - sources."@noble/curves-1.3.0" - sources."@noble/hashes-1.3.3" - sources."@scure/base-1.1.6" - sources."@scure/bip32-1.3.3" - sources."@scure/bip39-1.2.2" + sources."@noble/curves-1.4.0" + sources."@noble/hashes-1.4.0" + sources."@scure/base-1.1.7" + 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.1" + sources."@types/node-20.14.2" sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -74563,12 +72782,8 @@ in }) sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - (sources."ethereum-bloom-filters-1.1.0" // { - dependencies = [ - sources."@noble/hashes-1.4.0" - ]; - }) - sources."ethereum-cryptography-2.1.3" + sources."ethereum-bloom-filters-1.1.0" + sources."ethereum-cryptography-2.2.0" (sources."ethjs-unit-0.1.6" // { dependencies = [ sources."bn.js-4.11.6" @@ -74916,7 +73131,7 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."mute-stream-0.0.8" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."nanomatch-1.2.13" (sources."nconf-0.6.9" // { dependencies = [ @@ -75135,7 +73350,7 @@ in }) sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -75183,56 +73398,56 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.6" - sources."@babel/helper-annotate-as-pure-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/generator-7.24.7" + sources."@babel/helper-annotate-as-pure-7.24.7" + (sources."@babel/helper-compilation-targets-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.24.6" // { + (sources."@babel/helper-create-class-features-plugin-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-member-expression-to-functions-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-optimise-call-expression-7.24.6" - sources."@babel/helper-plugin-utils-7.24.6" - sources."@babel/helper-replace-supers-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - (sources."@babel/highlight-7.24.6" // { + 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.7" + sources."@babel/helper-module-imports-7.24.7" + sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-replace-supers-7.24.7" + 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.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.6" - sources."@babel/plugin-syntax-jsx-7.24.6" - sources."@babel/plugin-syntax-typescript-7.24.6" - sources."@babel/plugin-transform-modules-commonjs-7.24.6" - sources."@babel/plugin-transform-typescript-7.24.6" - sources."@babel/preset-typescript-7.24.6" - sources."@babel/runtime-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/parser-7.24.7" + sources."@babel/plugin-syntax-jsx-7.24.7" + sources."@babel/plugin-syntax-typescript-7.24.7" + sources."@babel/plugin-transform-modules-commonjs-7.24.7" + sources."@babel/plugin-transform-typescript-7.24.7" + sources."@babel/preset-typescript-7.24.7" + sources."@babel/runtime-7.24.7" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.5" @@ -75258,7 +73473,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.1" + sources."@types/node-20.14.2" sources."@types/node-fetch-2.6.11" sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" @@ -75274,7 +73489,7 @@ in sources."better-opn-2.1.1" sources."boolbase-1.0.0" sources."boxen-5.1.2" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -75282,7 +73497,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75340,7 +73555,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -75583,90 +73798,6 @@ in bypassCache = true; reconstructLock = true; }; - get-graphql-schema = nodeEnv.buildNodePackage { - name = "get-graphql-schema"; - packageName = "get-graphql-schema"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-graphql-schema/-/get-graphql-schema-2.1.2.tgz"; - sha512 = "1z5Hw91VrE3GrpCZE6lE8Dy+jz4kXWesLS7rCSjwOxf5BOcIedAZeTUJRIeIzmmR+PA9CKOkPTYFRJbdgUtrxA=="; - }; - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."encoding-0.1.13" - sources."escape-string-regexp-1.0.5" - sources."graphql-14.7.0" - sources."has-flag-3.0.0" - sources."iconv-lite-0.6.3" - sources."iterall-1.3.0" - sources."minimist-1.2.8" - sources."node-fetch-2.7.0" - sources."safer-buffer-2.1.2" - sources."supports-color-5.5.0" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Downloads the GraphQL Schema of an GraphQL endpoint URL"; - homepage = "https://github.com/graphcool/get-graphql-schema#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - git-run = nodeEnv.buildNodePackage { - name = "git-run"; - packageName = "git-run"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; - sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; - }; - dependencies = [ - sources."async-2.6.4" - sources."debug-4.3.5" - sources."lodash-4.17.21" - sources."lodash.groupby-4.6.0" - sources."microee-0.0.6" - sources."minilog-3.1.0" - sources."ms-2.1.2" - sources."simple-git-1.132.0" - sources."tabtab-git+https://github.com/mixu/node-tabtab.git" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for managing multiple git repositories"; - homepage = "https://github.com/mixu/gr#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - git-standup = nodeEnv.buildNodePackage { - name = "git-standup"; - packageName = "git-standup"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz"; - sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)"; - homepage = "https://github.com/kamranahmedse/git-standup#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; @@ -75715,168 +73846,6 @@ in bypassCache = true; reconstructLock = true; }; - gramma = nodeEnv.buildNodePackage { - name = "gramma"; - packageName = "gramma"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gramma/-/gramma-1.6.0.tgz"; - sha512 = "5I4yc0miSXU2jvD17zpleKufSggU8etr5uxxLX0nkFLJRfB4Fp2yg1s1SuietfaripT9H2lVhftFYrj2wl56uw=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."async-2.6.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-1.2.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."cli-progress-3.12.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."debug-3.2.7" - sources."decode-uri-component-0.2.2" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - sources."decompress-targz-4.1.1" - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - ]; - }) - sources."deep-is-0.1.4" - sources."dotenv-10.0.0" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.2" - sources."fd-slicer-1.1.0" - sources."file-type-5.2.0" - sources."filter-obj-1.1.0" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."get-stream-2.3.1" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."intercept-stdout-0.1.2" - sources."ip-regex-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-natural-number-4.0.1" - sources."is-stream-1.1.0" - sources."is-url-1.2.4" - sources."is2-2.0.9" - sources."isarray-1.0.0" - sources."isomorphic-fetch-3.0.0" - sources."kleur-4.1.5" - sources."lodash-4.17.21" - sources."lodash._arraycopy-3.0.0" - sources."lodash._basevalues-3.0.0" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.toarray-3.0.2" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.3" - sources."node-fetch-2.7.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."portfinder-1.0.32" - sources."process-nextick-args-2.0.1" - sources."progress-stream-2.0.0" - (sources."prompts-2.4.2" // { - dependencies = [ - sources."kleur-3.0.3" - ]; - }) - sources."query-string-7.1.3" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."require-directory-2.1.1" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."seek-bzip-1.0.6" - sources."sisteransi-1.0.5" - sources."speedometer-1.0.0" - sources."split-on-first-1.1.0" - sources."strict-uri-encode-2.0.0" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-dirs-2.1.0" - sources."tar-stream-1.6.2" - (sources."tcp-port-used-1.0.2" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - sources."through-2.3.8" - sources."through2-2.0.5" - sources."to-buffer-1.1.1" - sources."tr46-0.0.3" - sources."unbzip2-stream-1.4.3" - sources."util-deprecate-1.0.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.20" - sources."whatwg-url-5.0.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line grammar checker"; - homepage = "https://caderek.github.io/gramma/"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; grammarly-languageserver = nodeEnv.buildNodePackage { name = "grammarly-languageserver"; packageName = "grammarly-languageserver"; @@ -75924,10 +73893,10 @@ in graphql = nodeEnv.buildNodePackage { name = "graphql"; packageName = "graphql"; - version = "16.8.1"; + version = "16.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; - sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz"; + sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg=="; }; buildInputs = globalBuildInputs; meta = { @@ -75948,30 +73917,37 @@ in sha512 = "VmA5VrjEJZdHsG8JcIdofFtSWspdYlDtJobn6F+gWgRf6cXRbJwuzszcnx4yvhhwc7EcfRP29NLA2652SNhpgQ=="; }; dependencies = [ - sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + (sources."@ardatan/aggregate-error-0.0.6" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."tslib-2.0.3" ]; }) + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" sources."@exodus/schemasafe-1.3.0" - sources."@graphql-cli/common-4.1.0" + (sources."@graphql-cli/common-4.1.0" // { + dependencies = [ + sources."@graphql-tools/load-6.2.4" + sources."is-glob-4.0.1" + sources."p-limit-3.0.2" + sources."tslib-2.0.2" + ]; + }) (sources."@graphql-cli/init-4.1.0" // { dependencies = [ + sources."chalk-4.1.0" + sources."cosmiconfig-7.0.0" + sources."cross-fetch-3.0.6" sources."graphql-15.3.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + sources."tslib-2.0.2" ]; }) (sources."@graphql-tools/batch-execute-7.1.2" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" - sources."camel-case-4.1.2" sources."tslib-2.2.0" sources."value-or-promise-1.0.6" ]; @@ -75980,7 +73956,6 @@ in dependencies = [ sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" - sources."camel-case-4.1.2" sources."tslib-2.2.0" sources."value-or-promise-1.0.6" ]; @@ -75992,14 +73967,12 @@ in sources."tslib-2.2.0" ]; }) - sources."camel-case-4.1.2" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/import-6.7.18" // { dependencies = [ sources."@graphql-tools/utils-9.2.1" - sources."tslib-2.6.2" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -76009,14 +73982,17 @@ in sources."tslib-2.2.0" ]; }) - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.6.2" - ]; - }) + sources."tslib-2.0.3" + ]; + }) + (sources."@graphql-tools/load-6.2.8" // { + dependencies = [ + sources."@graphql-tools/utils-7.10.0" + sources."globby-11.0.3" + sources."is-glob-4.0.1" + sources."tslib-2.2.0" ]; }) - sources."@graphql-tools/load-6.2.4" (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ sources."@graphql-tools/utils-8.0.2" @@ -76027,24 +74003,28 @@ in dependencies = [ sources."@graphql-tools/merge-8.3.1" sources."@graphql-tools/utils-8.9.0" - sources."tslib-2.6.2" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" - sources."camel-case-4.1.2" - sources."cross-fetch-3.1.4" - sources."form-data-4.0.0" sources."tslib-2.2.0" ]; }) - sources."@graphql-tools/utils-6.2.4" + (sources."@graphql-tools/utils-6.2.4" // { + dependencies = [ + (sources."camel-case-4.1.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."tslib-2.0.3" + ]; + }) (sources."@graphql-tools/wrap-7.0.8" // { dependencies = [ sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" - sources."camel-case-4.1.2" sources."tslib-2.2.0" sources."value-or-promise-1.0.6" ]; @@ -76058,7 +74038,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.1" + sources."@types/node-20.14.2" sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -76069,7 +74049,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-4.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."array-buffer-byte-length-1.0.1" @@ -76098,25 +74078,22 @@ in sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."callsites-3.1.0" - (sources."camel-case-4.1.1" // { + sources."camel-case-4.1.2" + sources."caseless-0.12.0" + (sources."chalk-2.4.2" // { dependencies = [ - sources."tslib-1.14.1" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" ]; }) - sources."caseless-0.12.0" - sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.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."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -76124,19 +74101,20 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-6.0.0" (sources."create-graphback-1.0.1" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" + sources."ansi-regex-4.1.1" + sources."cli-cursor-2.1.0" + sources."log-symbols-2.2.0" + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" sources."ora-3.4.0" - sources."supports-color-5.5.0" + sources."restore-cursor-2.0.0" + sources."strip-ansi-5.2.0" ]; }) - sources."cross-fetch-3.0.6" + sources."cross-fetch-3.1.4" sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" @@ -76184,7 +74162,7 @@ in sources."filter-obj-2.0.2" 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."form-urlencoded-4.5.1" sources."fs-extra-9.0.1" sources."fs-minipass-2.1.0" @@ -76196,7 +74174,11 @@ in sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.2.3" + (sources."glob-7.2.3" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."globby-11.0.1" sources."gopd-1.0.1" @@ -76207,19 +74189,14 @@ in }) sources."graceful-fs-4.2.11" sources."graphql-15.8.0" - (sources."graphql-config-3.0.3" // { - dependencies = [ - sources."cosmiconfig-6.0.0" - sources."minimatch-3.0.4" - ]; - }) + sources."graphql-config-3.0.3" sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" sources."graphql-ws-4.9.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" + 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" @@ -76243,12 +74220,9 @@ in sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.1" - sources."cli-cursor-3.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.1" + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."internal-slot-1.0.7" @@ -76262,7 +74236,7 @@ in sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.1" + sources."is-glob-4.0.3" sources."is-interactive-1.0.0" sources."is-map-2.0.3" sources."is-number-7.0.0" @@ -76305,36 +74279,25 @@ in sources."lines-and-columns-1.2.4" sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" - (sources."log-symbols-2.2.0" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.6.2" + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) + sources."lower-case-2.0.2" sources."lowercase-keys-1.0.1" sources."map-age-cleaner-0.1.3" - (sources."mem-5.1.1" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."mem-5.1.1" sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.7" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-3.0.4" sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minizlib-2.1.2" @@ -76342,11 +74305,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.6.2" - ]; - }) + sources."no-case-3.0.4" sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-fetch-h2-2.3.0" @@ -76359,7 +74318,9 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ + sources."cliui-8.0.1" sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) sources."oas-schema-walker-1.1.5" @@ -76370,18 +74331,14 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.2" sources."open-7.3.0" sources."openapi-to-graphql-2.2.5" (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-regex-5.0.1" - sources."cli-cursor-3.1.0" - sources."log-symbols-4.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.1" + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."os-tmpdir-1.0.2" @@ -76390,7 +74347,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-some-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -76401,11 +74358,7 @@ in sources."parent-module-1.0.1" sources."parse-github-url-1.0.2" sources."parse-json-5.2.0" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.6.2" - ]; - }) + sources."pascal-case-3.1.2" sources."passwd-user-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -76427,11 +74380,15 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" - sources."request-2.88.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + ]; + }) sources."require-directory-2.1.1" sources."resolve-from-5.0.0" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" @@ -76462,20 +74419,17 @@ in sources."sshpk-1.18.0" sources."stop-iteration-iterator-1.0.0" sources."string-env-interpolation-1.0.1" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."strip-ansi-5.2.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."subscriptions-transport-ws-0.9.19" - sources."supports-color-7.2.0" + sources."supports-color-5.5.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ + sources."cliui-8.0.1" sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) sources."symbol-observable-1.2.0" @@ -76486,7 +74440,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.0.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" @@ -76505,26 +74459,15 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.2" sources."which-typed-array-1.1.15" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."ws-7.4.5" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" - (sources."yargs-16.0.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."cliui-7.0.4" - sources."strip-ansi-6.0.1" - sources."yargs-parser-20.2.9" - ]; - }) - sources."yargs-parser-21.1.1" + sources."yargs-16.0.3" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -76548,34 +74491,34 @@ in sources."@ampproject/remapping-2.3.0" sources."@ardatan/sync-fetch-0.0.1" sources."@astrojs/compiler-2.8.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - sources."@babel/core-7.24.6" - sources."@babel/generator-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + sources."@babel/core-7.24.7" + sources."@babel/generator-7.24.7" + (sources."@babel/helper-compilation-targets-7.24.7" // { dependencies = [ sources."lru-cache-5.1.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-plugin-utils-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/plugin-syntax-import-assertions-7.24.6" + 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.7" + sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/plugin-syntax-import-assertions-7.24.7" sources."@babel/polyfill-7.12.1" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@graphql-tools/batch-execute-9.0.4" sources."@graphql-tools/code-file-loader-8.0.3" sources."@graphql-tools/delegate-10.0.11" @@ -76591,7 +74534,7 @@ in 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.2.1" + sources."@graphql-tools/utils-10.2.2" sources."@graphql-tools/wrap-10.0.5" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" @@ -76607,27 +74550,27 @@ in sources."@pkgr/core-0.1.1" sources."@repeaterjs/repeater-3.0.6" sources."@types/estree-1.0.5" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/ws-8.5.10" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.3" - (sources."@vue/compiler-core-3.4.27" // { + (sources."@vue/compiler-core-3.4.29" // { dependencies = [ sources."source-map-js-1.2.0" ]; }) - sources."@vue/compiler-dom-3.4.27" - (sources."@vue/compiler-sfc-3.4.27" // { + sources."@vue/compiler-dom-3.4.29" + (sources."@vue/compiler-sfc-3.4.29" // { dependencies = [ sources."source-map-js-1.2.0" ]; }) - sources."@vue/compiler-ssr-3.4.27" - sources."@vue/shared-3.4.27" + sources."@vue/compiler-ssr-3.4.29" + sources."@vue/shared-3.4.29" sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.18" sources."@whatwg-node/node-fetch-0.5.11" - sources."acorn-8.11.3" + sources."acorn-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" @@ -76638,11 +74581,11 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -76666,7 +74609,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."entities-4.5.0" @@ -76687,7 +74630,7 @@ in sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.1.0" - sources."graphql-16.8.1" + sources."graphql-16.8.2" (sources."graphql-config-5.0.3" // { dependencies = [ sources."minimatch-4.2.3" @@ -76713,7 +74656,7 @@ in sources."is-number-7.0.0" sources."is-reference-3.0.2" sources."isomorphic-ws-5.0.0" - sources."jiti-1.21.0" + sources."jiti-1.21.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -76774,7 +74717,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.2.17" // { + (sources."svelte-4.2.18" // { dependencies = [ sources."estree-walker-3.0.3" ]; @@ -76784,7 +74727,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."unixify-1.0.0" @@ -77606,7 +75549,7 @@ in }) sources."moment-2.30.1" sources."mv-2.1.1" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -77750,12 +75693,12 @@ in 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.8.0" - sources."@opentelemetry/core-1.24.1" + sources."@opentelemetry/api-1.9.0" + sources."@opentelemetry/core-1.25.0" sources."@opentelemetry/instrumentation-0.41.2" - sources."@opentelemetry/resources-1.24.1" - sources."@opentelemetry/sdk-trace-base-1.24.1" - sources."@opentelemetry/semantic-conventions-1.24.1" + sources."@opentelemetry/resources-1.25.0" + sources."@opentelemetry/sdk-trace-base-1.25.0" + sources."@opentelemetry/semantic-conventions-1.25.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -77768,11 +75711,11 @@ in sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" sources."@tootallnate/once-2.0.0" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/shimmer-1.0.5" sources."@vscode/l10n-0.0.16" sources."abbrev-2.0.0" - sources."acorn-8.11.3" + sources."acorn-8.12.0" sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -77831,7 +75774,11 @@ in sources."domutils-3.1.0" sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - sources."editorconfig-1.0.4" + (sources."editorconfig-1.0.4" // { + dependencies = [ + sources."minimatch-9.0.1" + ]; + }) sources."emitter-listener-1.1.2" sources."emoji-regex-9.2.2" sources."encoding-0.1.13" @@ -77843,7 +75790,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."forever-agent-0.6.1" sources."form-data-4.0.0" sources."fs-extra-11.1.1" @@ -77863,11 +75810,7 @@ in ]; }) sources."getpass-0.1.7" - (sources."glob-10.4.1" // { - dependencies = [ - sources."minimatch-9.0.4" - ]; - }) + sources."glob-10.4.1" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" @@ -77892,7 +75835,7 @@ in sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" @@ -77911,7 +75854,7 @@ in sources."micromatch-4.0.7" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-9.0.1" + sources."minimatch-9.0.4" sources."minipass-7.1.2" (sources."minizlib-2.1.2" // { dependencies = [ @@ -77921,7 +75864,7 @@ in sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" sources."ms-2.1.2" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."node-fetch-2.7.0" sources."nopt-7.2.1" sources."npmlog-5.0.1" @@ -78002,7 +75945,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."turndown-7.1.3" sources."turndown-plugin-gfm-1.0.2" @@ -78184,13 +76127,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.587.0" // { + (sources."@aws-sdk/signature-v4-crt-3.598.0" // { dependencies = [ - sources."@aws-sdk/middleware-sdk-s3-3.587.0" - sources."@aws-sdk/signature-v4-multi-region-3.587.0" - sources."@aws-sdk/types-3.577.0" + sources."@aws-sdk/middleware-sdk-s3-3.598.0" + sources."@aws-sdk/signature-v4-multi-region-3.598.0" + sources."@aws-sdk/types-3.598.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-user-agent-node-3.587.0" + sources."@aws-sdk/util-user-agent-node-3.598.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -78222,7 +76165,7 @@ 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.6" + sources."@babel/runtime-7.24.7" sources."@braintree/sanitize-url-6.0.4" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" @@ -78253,29 +76196,29 @@ in sources."@mapbox/node-pre-gyp-1.0.11" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@smithy/abort-controller-3.0.0" - sources."@smithy/fetch-http-handler-3.0.1" + sources."@smithy/abort-controller-3.0.1" + sources."@smithy/fetch-http-handler-3.0.2" sources."@smithy/is-array-buffer-3.0.0" - sources."@smithy/middleware-endpoint-3.0.1" - sources."@smithy/middleware-serde-3.0.0" - sources."@smithy/middleware-stack-3.0.0" - sources."@smithy/node-config-provider-3.1.0" - sources."@smithy/node-http-handler-3.0.0" - sources."@smithy/property-provider-3.1.0" - sources."@smithy/protocol-http-4.0.0" - sources."@smithy/querystring-builder-3.0.0" - sources."@smithy/querystring-parser-3.0.0" - sources."@smithy/shared-ini-file-loader-3.1.0" - sources."@smithy/signature-v4-3.0.0" - sources."@smithy/smithy-client-3.1.1" - sources."@smithy/types-3.0.0" - sources."@smithy/url-parser-3.0.0" + sources."@smithy/middleware-endpoint-3.0.2" + sources."@smithy/middleware-serde-3.0.1" + sources."@smithy/middleware-stack-3.0.1" + sources."@smithy/node-config-provider-3.1.1" + sources."@smithy/node-http-handler-3.0.1" + sources."@smithy/property-provider-3.1.1" + sources."@smithy/protocol-http-4.0.1" + sources."@smithy/querystring-builder-3.0.1" + sources."@smithy/querystring-parser-3.0.1" + sources."@smithy/shared-ini-file-loader-3.1.1" + sources."@smithy/signature-v4-3.1.0" + sources."@smithy/smithy-client-3.1.2" + sources."@smithy/types-3.1.0" + sources."@smithy/url-parser-3.0.1" sources."@smithy/util-base64-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.0" - sources."@smithy/util-stream-3.0.1" + sources."@smithy/util-middleware-3.0.1" + sources."@smithy/util-stream-3.0.2" sources."@smithy/util-uri-escape-3.0.0" sources."@smithy/util-utf8-3.0.0" sources."@tootallnate/once-2.0.0" @@ -78286,7 +76229,7 @@ in sources."@types/mdast-3.0.15" sources."@types/ms-0.7.34" sources."@types/nanoid-3.0.0" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/unist-2.0.10" sources."@types/ws-8.5.10" sources."abab-2.0.6" @@ -78317,7 +76260,7 @@ in sources."async-mutex-0.4.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.7" - sources."aws-crt-1.21.2" + sources."aws-crt-1.21.3" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -78535,7 +76478,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.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -78826,7 +76769,7 @@ in sources."ms-2.1.2" sources."multiparty-4.2.3" sources."mustache-4.2.0" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."nanoid-3.3.7" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" @@ -78834,7 +76777,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" sources."no-case-2.3.2" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" @@ -78952,7 +76895,7 @@ in sources."requires-port-1.0.0" sources."reselect-4.1.8" sources."retry-0.12.0" - sources."rfdc-1.3.1" + sources."rfdc-1.4.1" sources."rimraf-3.0.2" sources."robust-predicates-3.0.2" sources."rrweb-cssom-0.6.0" @@ -79085,13 +77028,13 @@ in sources."tr46-4.1.1" sources."tree-kit-0.8.7" sources."ts-dedent-2.2.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" 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.17.4" + sources."uglify-js-3.18.0" sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" sources."undici-types-5.26.5" @@ -79190,7 +77133,7 @@ in sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" (sources."glob-10.4.1" // { dependencies = [ sources."minimatch-9.0.4" @@ -79199,7 +77142,7 @@ in sources."ini-1.3.8" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."js-cookie-3.0.5" sources."lru-cache-10.2.2" sources."minimatch-9.0.1" @@ -79276,7 +77219,7 @@ in sha512 = "Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw=="; }; dependencies = [ - sources."@babel/parser-7.24.6" + sources."@babel/parser-7.24.7" sources."@jsdoc/salty-0.2.8" sources."@types/linkify-it-5.0.0" sources."@types/markdown-it-14.1.1" @@ -79550,7 +77493,7 @@ in sources."steno-4.0.2" sources."to-regex-range-5.0.1" sources."totalist-3.0.1" - sources."type-fest-4.19.0" + sources."type-fest-4.20.0" ]; buildInputs = globalBuildInputs; meta = { @@ -79852,7 +77795,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.19.0" + sources."nan-2.20.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -80309,7 +78252,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."type-2.7.3" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -80362,42 +78305,42 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/cli-7.24.6" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { + sources."@babel/cli-7.24.7" + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.6" - sources."@babel/helper-annotate-as-pure-7.24.6" - (sources."@babel/helper-compilation-targets-7.24.6" // { + sources."@babel/generator-7.24.7" + sources."@babel/helper-annotate-as-pure-7.24.7" + (sources."@babel/helper-compilation-targets-7.24.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-plugin-utils-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/node-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/plugin-syntax-jsx-7.24.6" - sources."@babel/plugin-transform-react-jsx-7.24.6" + 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.7" + sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/node-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/plugin-syntax-jsx-7.24.7" + sources."@babel/plugin-transform-react-jsx-7.24.7" sources."@babel/register-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/template-7.24.7" + sources."@babel/traverse-7.24.7" + sources."@babel/types-7.24.7" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -80452,7 +78395,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.11.3" + sources."acorn-8.12.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -80495,13 +78438,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.0" + sources."browserslist-4.23.1" 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.30001627" + sources."caniuse-lite-1.0.30001634" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -80564,7 +78507,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -80756,10 +78699,10 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multistream-4.1.0" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."napi-build-utils-1.0.2" sources."negotiator-0.6.3" - (sources."node-abi-3.63.0" // { + (sources."node-abi-3.65.0" // { dependencies = [ sources."semver-7.6.2" ]; @@ -80939,7 +78882,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.4" sources."tr46-0.0.3" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-is-1.6.18" sources."typed-array-buffer-1.0.2" @@ -81063,9 +79006,9 @@ in sha512 = "Dg/r1dGnRCXKsOUC3lol7o6ggYTA6WWiPQzZJNKqyygn4fzYGuA3Dro2d5677pajaqFnFA72mdCjzSyF16Vi2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -81076,7 +79019,16 @@ in ]; }) sources."@hutson/parse-repository-url-3.0.2" - sources."@isaacs/cliui-8.0.2" + (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."@jest/schemas-29.6.3" sources."@lerna/create-8.1.3" sources."@nodelib/fs.scandir-2.1.5" @@ -81086,28 +79038,39 @@ in sources."@npmcli/fs-3.1.1" (sources."@npmcli/git-5.0.7" // { dependencies = [ - sources."proc-log-4.2.0" - ]; - }) - (sources."@npmcli/installed-package-contents-2.1.0" // { - dependencies = [ - sources."npm-bundled-3.0.1" + sources."isexe-3.1.1" + sources."which-4.0.0" ]; }) + sources."@npmcli/installed-package-contents-2.1.0" sources."@npmcli/node-gyp-3.0.0" - sources."@npmcli/promise-spawn-7.0.2" + (sources."@npmcli/promise-spawn-7.0.2" // { + dependencies = [ + sources."isexe-3.1.1" + sources."which-4.0.0" + ]; + }) sources."@npmcli/redact-1.1.0" - sources."@npmcli/run-script-7.0.2" - sources."@nrwl/devkit-19.1.2" - sources."@nrwl/tao-19.1.2" - (sources."@nx/devkit-19.1.2" // { + (sources."@npmcli/run-script-7.0.2" // { + dependencies = [ + sources."isexe-3.1.1" + sources."which-4.0.0" + ]; + }) + sources."@nrwl/devkit-19.3.0" + sources."@nrwl/tao-19.3.0" + (sources."@nx/devkit-19.3.0" // { dependencies = [ sources."minimatch-9.0.3" ]; }) sources."@octokit/auth-token-3.0.4" sources."@octokit/core-4.2.4" - sources."@octokit/endpoint-7.0.6" + (sources."@octokit/endpoint-7.0.6" // { + dependencies = [ + sources."is-plain-object-5.0.0" + ]; + }) sources."@octokit/graphql-5.0.6" sources."@octokit/openapi-types-18.1.1" sources."@octokit/plugin-enterprise-rest-6.0.1" @@ -81118,58 +79081,32 @@ in sources."@octokit/types-10.0.0" ]; }) - sources."@octokit/request-6.2.8" + (sources."@octokit/request-6.2.8" // { + dependencies = [ + sources."is-plain-object-5.0.0" + ]; + }) sources."@octokit/request-error-3.0.3" sources."@octokit/rest-19.0.11" sources."@octokit/tsconfig-1.0.2" sources."@octokit/types-9.3.2" - sources."@sigstore/bundle-1.1.0" + sources."@sigstore/bundle-2.3.2" sources."@sigstore/core-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - (sources."@sigstore/sign-1.0.0" // { - dependencies = [ - sources."agent-base-6.0.2" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.6" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - ]; - }) - sources."@sigstore/tuf-1.0.3" - (sources."@sigstore/verify-1.2.1" // { - dependencies = [ - sources."@sigstore/bundle-2.3.2" - sources."@sigstore/protobuf-specs-0.3.2" - ]; - }) + sources."@sigstore/protobuf-specs-0.3.2" + sources."@sigstore/sign-2.3.2" + sources."@sigstore/tuf-2.3.4" + sources."@sigstore/verify-1.2.1" sources."@sinclair/typebox-0.27.8" sources."@swc-node/core-1.13.1" - sources."@swc-node/register-1.9.1" + sources."@swc-node/register-1.9.2" sources."@swc-node/sourcemap-support-0.5.0" - sources."@swc/core-1.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" + sources."@swc/types-0.1.8" sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { + sources."@tufjs/canonical-json-2.0.0" + (sources."@tufjs/models-2.0.1" // { dependencies = [ sources."minimatch-9.0.4" ]; @@ -81180,12 +79117,14 @@ in sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ - sources."argparse-1.0.10" sources."js-yaml-3.14.1" - sources."sprintf-js-1.0.3" ]; }) - sources."@zkochan/js-yaml-0.0.7" + (sources."@zkochan/js-yaml-0.0.7" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."JSONStream-1.3.5" sources."abbrev-2.0.0" sources."add-stream-1.0.0" @@ -81193,20 +79132,16 @@ in sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ansi-colors-4.1.3" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."array-differ-3.0.0" sources."array-ify-1.0.0" sources."array-union-2.1.0" - sources."arrify-1.0.1" + sources."arrify-2.0.1" sources."async-3.2.5" sources."asynckit-0.4.0" sources."axios-1.7.2" @@ -81222,73 +79157,52 @@ in sources."byte-size-8.1.1" (sources."cacache-18.0.3" // { dependencies = [ + sources."fs-minipass-3.0.3" + sources."minipass-7.1.2" sources."ssri-10.0.6" ]; }) sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - (sources."chalk-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-3.9.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.2" + sources."cli-spinners-2.6.1" sources."cli-width-3.0.0" - (sources."cliui-7.0.4" // { - 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."wrap-ansi-7.0.0" - ]; - }) + sources."cliui-8.0.1" sources."clone-1.0.4" - (sources."clone-deep-4.0.1" // { - dependencies = [ - sources."is-plain-object-2.0.4" - ]; - }) + sources."clone-deep-4.0.1" sources."cmd-shim-6.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colorette-2.0.20" - (sources."columnify-1.6.0" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."columnify-1.6.0" sources."combined-stream-1.0.8" sources."compare-func-2.0.0" sources."concat-map-0.0.1" sources."concat-stream-2.0.0" sources."console-control-strings-1.1.0" sources."conventional-changelog-angular-7.0.0" - sources."conventional-changelog-core-5.0.1" + (sources."conventional-changelog-core-5.0.1" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" + ]; + }) sources."conventional-changelog-preset-loader-3.0.0" sources."conventional-changelog-writer-6.0.1" sources."conventional-commits-filter-3.0.0" sources."conventional-commits-parser-4.0.0" sources."conventional-recommended-bump-7.0.1" sources."core-util-is-1.0.3" - (sources."cosmiconfig-8.3.6" // { - dependencies = [ - sources."path-type-4.0.0" - ]; - }) - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."isexe-2.0.0" - sources."which-2.0.2" - ]; - }) + sources."cosmiconfig-8.3.6" + sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."dateformat-3.0.3" sources."debug-4.3.5" @@ -81306,18 +79220,14 @@ in sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."diff-sequences-29.6.3" - (sources."dir-glob-3.0.1" // { - dependencies = [ - sources."path-type-4.0.0" - ]; - }) + sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."dotenv-16.3.2" sources."dotenv-expand-10.0.0" sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" sources."ejs-3.1.10" - sources."emoji-regex-9.2.2" + sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -81352,32 +79262,33 @@ in sources."find-up-4.1.0" sources."flat-5.0.2" sources."follow-redirects-1.15.6" - (sources."foreground-child-3.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; }) sources."form-data-4.0.0" - sources."fs-constants-1.0.0" - sources."fs-extra-11.2.0" - sources."fs-minipass-3.0.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - (sources."gauge-4.0.4" // { + (sources."front-matter-4.0.2" // { dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."js-yaml-3.14.1" ]; }) + sources."fs-constants-1.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-4.0.4" sources."get-caller-file-2.0.5" (sources."get-pkg-repo-4.2.1" // { dependencies = [ - sources."emoji-regex-8.0.0" + sources."cliui-7.0.4" sources."hosted-git-info-4.1.0" sources."lru-cache-6.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -81397,6 +79308,7 @@ in (sources."glob-10.4.1" // { dependencies = [ sources."minimatch-9.0.4" + sources."minipass-7.1.2" ]; }) sources."glob-parent-5.1.2" @@ -81407,7 +79319,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" + sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-7.0.2" sources."https-proxy-agent-7.0.4" @@ -81416,9 +79328,9 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.3.1" - (sources."ignore-walk-5.0.1" // { + (sources."ignore-walk-6.0.5" // { dependencies = [ - sources."minimatch-5.1.6" + sources."minimatch-9.0.4" ]; }) (sources."import-fresh-3.3.0" // { @@ -81437,20 +79349,21 @@ in sources."hosted-git-info-6.1.1" sources."lru-cache-7.18.3" sources."npm-package-arg-10.1.0" + sources."proc-log-3.0.0" ]; }) (sources."inquirer-8.2.6" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.2" - sources."emoji-regex-8.0.0" - sources."mute-stream-0.0.8" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."ora-5.4.1" sources."wrap-ansi-6.2.0" ]; }) - sources."ip-address-9.0.5" + (sources."ip-address-9.0.5" // { + dependencies = [ + sources."sprintf-js-1.1.3" + ]; + }) sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" sources."is-core-module-2.13.1" @@ -81463,16 +79376,16 @@ in sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-5.0.0" + sources."is-plain-object-2.0.4" sources."is-ssh-1.4.0" sources."is-stream-2.0.0" sources."is-text-path-1.0.1" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isexe-3.1.1" + sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" (sources."jake-10.9.1" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -81482,7 +79395,11 @@ in sources."jest-diff-29.7.0" sources."jest-get-type-29.6.3" sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."jsbn-1.1.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-3.0.2" @@ -81497,18 +79414,46 @@ in sources."hosted-git-info-6.1.1" sources."lru-cache-7.18.3" sources."npm-package-arg-10.1.0" + sources."proc-log-3.0.0" ]; }) (sources."libnpmpublish-7.3.0" // { dependencies = [ + sources."@sigstore/bundle-1.1.0" + sources."@sigstore/protobuf-specs-0.2.1" + sources."@sigstore/sign-1.0.0" + sources."@sigstore/tuf-1.0.3" + sources."@tufjs/canonical-json-1.0.0" + sources."@tufjs/models-1.0.4" + sources."agent-base-6.0.2" + sources."cacache-17.1.4" + sources."fs-minipass-3.0.3" sources."hosted-git-info-6.1.1" + sources."http-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."lru-cache-7.18.3" + (sources."make-fetch-happen-11.1.1" // { + dependencies = [ + sources."minipass-5.0.0" + ]; + }) + sources."minimatch-9.0.4" + sources."minipass-7.1.2" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."normalize-package-data-5.0.0" sources."npm-package-arg-10.1.0" + sources."proc-log-3.0.0" + sources."sigstore-1.9.0" + sources."socks-proxy-agent-7.0.0" sources."ssri-10.0.6" + sources."tuf-js-1.1.7" ]; }) - sources."lines-and-columns-1.2.4" + sources."lines-and-columns-2.0.4" (sources."load-json-file-6.2.0" // { dependencies = [ sources."strip-bom-4.0.0" @@ -81523,15 +79468,19 @@ in sources."make-dir-4.0.0" (sources."make-fetch-happen-13.0.1" // { dependencies = [ - sources."proc-log-4.2.0" + sources."minipass-7.1.2" sources."ssri-10.0.6" ]; }) sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.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" ]; @@ -81542,6 +79491,7 @@ in ]; }) sources."semver-5.7.2" + sources."type-fest-0.18.1" sources."yargs-parser-20.2.9" ]; }) @@ -81558,10 +79508,22 @@ in ]; }) sources."minimist-1.2.8" - sources."minimist-options-4.1.0" - sources."minipass-7.1.2" - sources."minipass-collect-2.0.1" - sources."minipass-fetch-3.0.5" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) + sources."minipass-5.0.0" + (sources."minipass-collect-2.0.1" // { + dependencies = [ + sources."minipass-7.1.2" + ]; + }) + (sources."minipass-fetch-3.0.5" // { + dependencies = [ + sources."minipass-7.1.2" + ]; + }) (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -81590,29 +79552,22 @@ in sources."mkdirp-1.0.4" sources."modify-values-1.0.1" sources."ms-2.1.2" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."arrify-2.0.1" - ]; - }) - sources."mute-stream-1.0.0" + sources."multimatch-5.0.0" + sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-fetch-2.6.7" - sources."node-gyp-10.1.0" + (sources."node-gyp-10.1.0" // { + dependencies = [ + sources."isexe-3.1.1" + sources."proc-log-3.0.0" + sources."which-4.0.0" + ]; + }) sources."node-machine-id-1.1.12" sources."nopt-7.2.1" - (sources."normalize-package-data-3.0.3" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" - ]; - }) - (sources."npm-bundled-1.1.2" // { - dependencies = [ - sources."npm-normalize-package-bin-1.0.1" - ]; - }) + sources."normalize-package-data-6.0.1" + 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-8.1.1" // { @@ -81625,15 +79580,15 @@ in (sources."npm-packlist-5.1.1" // { dependencies = [ sources."glob-8.1.0" + sources."ignore-walk-5.0.1" sources."minimatch-5.1.6" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" ]; }) (sources."npm-pick-manifest-9.0.1" // { dependencies = [ - sources."hosted-git-info-7.0.2" sources."npm-package-arg-11.0.2" - sources."proc-log-4.2.0" ]; }) (sources."npm-registry-fetch-14.0.5" // { @@ -81644,18 +79599,23 @@ in sources."minipass-7.1.2" ]; }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.1.2" + ]; + }) sources."hosted-git-info-6.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."lru-cache-7.18.3" sources."make-fetch-happen-11.1.1" - sources."minipass-5.0.0" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) sources."npm-package-arg-10.1.0" + sources."proc-log-3.0.0" sources."socks-proxy-agent-7.0.0" (sources."ssri-10.0.6" // { dependencies = [ @@ -81666,28 +79626,15 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-19.1.2" // { + (sources."nx-19.3.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cli-spinners-2.6.1" - sources."cliui-8.0.1" - sources."emoji-regex-8.0.0" - sources."lines-and-columns-2.0.4" sources."minimatch-9.0.3" - sources."ora-5.3.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" ]; }) sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.2" - (sources."ora-5.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."ora-5.3.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -81702,30 +79649,20 @@ in sources."p-waterfall-2.1.1" (sources."pacote-17.0.7" // { dependencies = [ - sources."@sigstore/bundle-2.3.2" - sources."@sigstore/protobuf-specs-0.3.2" - sources."@sigstore/sign-2.3.2" - sources."@sigstore/tuf-2.3.4" - sources."@tufjs/canonical-json-2.0.0" - sources."@tufjs/models-2.0.1" - sources."hosted-git-info-7.0.2" - sources."ignore-walk-6.0.5" - sources."minimatch-9.0.4" - sources."normalize-package-data-6.0.1" + sources."fs-minipass-3.0.3" + sources."minipass-7.1.2" sources."npm-package-arg-11.0.2" sources."npm-packlist-8.0.2" sources."npm-registry-fetch-16.2.1" - sources."proc-log-4.2.0" sources."read-package-json-7.0.1" - sources."sigstore-2.3.1" sources."ssri-10.0.6" - sources."tuf-js-2.2.1" ]; }) sources."parent-module-1.0.1" (sources."parse-json-5.2.0" // { dependencies = [ sources."json-parse-even-better-errors-2.3.1" + sources."lines-and-columns-1.2.4" ]; }) sources."parse-path-7.0.0" @@ -81734,11 +79671,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."path-type-4.0.0" sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."pify-5.0.0" @@ -81749,12 +79682,13 @@ in sources."ansi-styles-5.2.0" ]; }) - sources."proc-log-3.0.0" + sources."proc-log-4.2.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" (sources."promzard-1.0.2" // { dependencies = [ + sources."mute-stream-1.0.0" sources."read-3.0.1" ]; }) @@ -81763,7 +79697,11 @@ in sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."react-is-18.3.1" - sources."read-2.1.0" + (sources."read-2.1.0" // { + dependencies = [ + sources."mute-stream-1.0.0" + ]; + }) sources."read-cmd-shim-4.0.0" (sources."read-package-json-6.0.4" // { dependencies = [ @@ -81775,9 +79713,11 @@ in sources."read-package-json-fast-3.0.2" (sources."read-pkg-3.0.0" // { dependencies = [ + sources."hosted-git-info-2.8.9" sources."load-json-file-4.0.0" sources."normalize-package-data-2.5.0" sources."parse-json-4.0.0" + sources."path-type-3.0.0" sources."pify-3.0.0" sources."semver-5.7.2" ]; @@ -81819,32 +79759,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - (sources."sigstore-1.9.0" // { - dependencies = [ - sources."agent-base-6.0.2" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.6" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - ]; - }) + sources."sigstore-2.3.1" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.8.3" @@ -81858,25 +79773,16 @@ in sources."spdx-license-ids-3.0.18" sources."split-1.0.1" sources."split2-3.2.2" - sources."sprintf-js-1.1.3" + sources."sprintf-js-1.0.3" (sources."ssri-9.0.1" // { dependencies = [ sources."minipass-3.3.6" ]; }) - 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-width-4.2.3" + sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) + sources."strip-ansi-6.0.1" sources."strip-ansi-cjs-6.0.1" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" @@ -81884,16 +79790,7 @@ in sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.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."tar-6.2.1" sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" sources."text-extensions-1.9.0" @@ -81910,37 +79807,12 @@ in sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" - sources."tslib-2.6.2" - (sources."tuf-js-1.1.7" // { - dependencies = [ - sources."agent-base-6.0.2" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.6" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - ]; - }) - sources."type-fest-0.18.1" + sources."tslib-2.6.3" + sources."tuf-js-2.2.1" + sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."typescript-5.4.5" - sources."uglify-js-3.17.4" + sources."uglify-js-3.18.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universal-user-agent-6.0.1" @@ -81957,24 +79829,11 @@ in sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-4.0.0" - (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."which-2.0.2" + sources."wide-align-1.1.5" sources."wordwrap-1.0.0" - 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."wrap-ansi-7.0.0" + sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" (sources."write-file-atomic-5.0.1" // { dependencies = [ @@ -81997,16 +79856,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.7.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-8.0.1" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - ]; - }) + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -82044,7 +79894,7 @@ in sources."sax-1.4.1" sources."semver-5.7.2" sources."source-map-0.6.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; buildInputs = globalBuildInputs; meta = { @@ -82228,7 +80078,7 @@ in sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.3" sources."normalize-path-3.0.0" @@ -82598,7 +80448,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.19.0" + sources."nan-2.20.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -82895,7 +80745,7 @@ 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.1" + sources."@types/node-20.14.2" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -82915,10 +80765,10 @@ in lv_font_conv = nodeEnv.buildNodePackage { name = "lv_font_conv"; packageName = "lv_font_conv"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz"; - sha512 = "0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg=="; + url = "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.3.tgz"; + sha512 = "0xJQThBOw2iptFccSXrKDIUTQAwr/2zhKjCI1lATIRgZo8uvYRTmenKafW9yTw6G0y5AyW00tqGpUtYuTuBIbQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82964,94 +80814,6 @@ in bypassCache = true; reconstructLock = true; }; - markdown-link-check = nodeEnv.buildNodePackage { - name = "markdown-link-check"; - packageName = "markdown-link-check"; - version = "3.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.12.2.tgz"; - sha512 = "GWMwSvxuZn+uGGydi5yywnnDZy08SGps4I/63xqvWT7lxtH4cVLnhgZZYtEcPz/QvgPg9vbH2rvWpa29owMtHA=="; - }; - dependencies = [ - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."agent-base-7.1.1" - sources."ast-types-0.13.4" - sources."async-3.2.5" - sources."basic-ftp-5.0.5" - sources."boolbase-1.0.0" - sources."chalk-5.3.0" - sources."cheerio-1.0.0-rc.12" - sources."cheerio-select-2.1.0" - sources."commander-12.1.0" - sources."css-select-5.1.0" - sources."css-what-6.1.0" - sources."data-uri-to-buffer-6.0.2" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."degenerator-5.0.1" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - 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."fs-extra-11.2.0" - sources."get-uri-6.0.3" - sources."graceful-fs-4.2.11" - sources."html-link-extractor-1.0.5" - sources."htmlparser2-8.0.2" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" - sources."iconv-lite-0.6.3" - sources."ip-address-9.0.5" - sources."is-absolute-url-4.0.1" - sources."is-relative-url-4.0.0" - sources."isemail-3.2.0" - sources."jsbn-1.1.0" - sources."jsonfile-6.1.0" - sources."link-check-5.3.0" - sources."lodash-4.17.21" - sources."lru-cache-7.18.3" - sources."markdown-link-extractor-4.0.2" - sources."marked-12.0.2" - sources."ms-2.1.3" - sources."needle-3.3.1" - sources."netmask-2.0.2" - sources."nth-check-2.1.1" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.1" - sources."parse5-7.1.2" - sources."parse5-htmlparser2-tree-adapter-7.0.0" - sources."progress-2.0.3" - sources."proxy-agent-6.4.0" - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.1" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."smart-buffer-4.2.0" - sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" - sources."source-map-0.6.1" - sources."sprintf-js-1.1.3" - sources."tslib-2.6.2" - sources."universalify-2.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; - homepage = "https://github.com/tcort/markdown-link-check#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; @@ -83706,7 +81468,7 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."exponential-backoff-3.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."fs-minipass-3.0.3" sources."glob-10.4.1" sources."graceful-fs-4.2.11" @@ -83719,7 +81481,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."jsbn-1.1.0" sources."lru-cache-10.2.2" (sources."make-fetch-happen-13.0.1" // { @@ -83931,29 +81693,26 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-3.1.9.tgz"; - sha512 = "SNuXZoplH/UewibVbe/UPyMhsmeuoCGjDVmBmWo+Wj8arE14PF1cOoTKdnbv5F/vPc1kbUvd0+oWCm9kv7wfkw=="; + url = "https://registry.npmjs.org/node-red/-/node-red-3.1.10.tgz"; + sha512 = "EjjcdgWat7wNcSCyxmSc0uHM5UV2eXEJRbTCzR/xi87Dt0E1gSl/YDAopyu590sz1YybExNk3jQRLmQVjx0POw=="; }; dependencies = [ - sources."@babel/runtime-7.24.6" + sources."@babel/runtime-7.24.7" sources."@mapbox/node-pre-gyp-1.0.11" - (sources."@node-red/editor-api-3.1.9" // { - dependencies = [ - sources."mime-3.0.0" - ]; - }) - sources."@node-red/editor-client-3.1.9" - (sources."@node-red/nodes-3.1.9" // { + sources."@node-red/editor-api-3.1.10" + sources."@node-red/editor-client-3.1.10" + (sources."@node-red/nodes-3.1.10" // { dependencies = [ sources."cookie-0.5.0" + sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" ]; }) - sources."@node-red/registry-3.1.9" - sources."@node-red/runtime-3.1.9" - sources."@node-red/util-3.1.9" + sources."@node-red/registry-3.1.10" + sources."@node-red/runtime-3.1.10" + sources."@node-red/util-3.1.10" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.4" @@ -83961,13 +81720,22 @@ in sources."accepts-1.3.8" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" - sources."agent-base-6.0.2" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) sources."ajv-8.12.0" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."append-field-1.0.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + (sources."are-we-there-yet-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."async-mutex-0.4.0" @@ -83982,14 +81750,12 @@ in }) sources."bcrypt-5.1.0" sources."bcryptjs-2.4.3" - sources."bl-4.1.0" - (sources."body-parser-1.20.2" // { + (sources."bl-4.1.0" // { dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" + sources."readable-stream-3.6.2" ]; }) + sources."body-parser-1.20.2" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" @@ -84010,11 +81776,11 @@ in sources."combined-stream-1.0.8" sources."commist-1.1.0" sources."concat-map-0.0.1" - sources."concat-stream-2.0.0" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.6.0" + sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { dependencies = [ sources."cookie-0.4.1" @@ -84026,7 +81792,7 @@ in sources."cronosjs-1.7.1" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."debug-4.3.5" + sources."debug-2.6.9" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -84044,11 +81810,19 @@ in sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."duplexify-4.1.3" + (sources."duplexify-4.1.3" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."encoding-0.1.13" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" sources."enquirer-2.4.1" sources."entities-2.2.0" @@ -84058,33 +81832,26 @@ in sources."etag-1.8.1" (sources."express-4.19.2" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."express-session-1.17.3" // { - dependencies = [ - sources."cookie-0.4.2" - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."cookie-0.6.0" ]; }) + sources."express-session-1.17.3" sources."fast-deep-equal-3.1.3" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."finalhandler-1.2.0" sources."follow-redirects-1.15.6" 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-extra-11.1.1" + (sources."fs-extra-11.1.1" // { + dependencies = [ + sources."universalify-2.0.1" + ]; + }) (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" + sources."yallist-4.0.0" ]; }) sources."fs.realpath-1.0.0" @@ -84102,15 +81869,24 @@ in sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."hasown-2.0.2" - sources."help-me-3.0.0" + (sources."help-me-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."hpagent-1.2.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-2.2.1" - sources."https-proxy-agent-5.0.1" + (sources."https-proxy-agent-5.0.1" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) sources."i18next-21.10.0" - sources."iconv-lite-0.6.3" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -84124,12 +81900,16 @@ in sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" sources."jsonata-1.8.7" - sources."jsonfile-6.1.0" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.1" + ]; + }) sources."keyv-4.5.4" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" + sources."lru-cache-4.1.5" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -84138,13 +81918,13 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.7" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."debug-4.3.5" + sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.6.0" + sources."mime-3.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-response-4.0.0" @@ -84154,23 +81934,30 @@ in (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" + sources."yallist-4.0.0" ]; }) - sources."mkdirp-1.0.4" + sources."mkdirp-0.5.6" sources."moment-2.29.4" sources."moment-timezone-0.5.43" - sources."mqtt-4.3.7" - sources."mqtt-packet-6.10.0" - sources."ms-2.1.2" - (sources."multer-1.4.5-lts.1" // { + (sources."mqtt-4.3.7" // { dependencies = [ - sources."concat-stream-1.6.2" - sources."mkdirp-0.5.6" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."concat-stream-2.0.0" + sources."debug-4.3.5" + sources."lru-cache-6.0.0" + sources."ms-2.1.2" + sources."readable-stream-3.6.2" + sources."yallist-4.0.0" ]; }) + (sources."mqtt-packet-6.10.0" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) + sources."ms-2.0.0" + sources."multer-1.4.5-lts.1" sources."mustache-4.2.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" @@ -84183,13 +81970,13 @@ in sources."normalize-url-8.0.1" sources."npmlog-5.0.1" sources."nth-check-2.1.1" - sources."number-allocator-1.0.14" - (sources."oauth2orize-1.11.1" // { + (sources."number-allocator-1.0.14" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."debug-4.3.5" + sources."ms-2.1.2" ]; }) + sources."oauth2orize-1.11.1" sources."object-assign-4.1.1" sources."object-inspect-1.13.1" sources."on-finished-2.4.1" @@ -84218,32 +82005,33 @@ in sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { + sources."raw-body-2.5.2" + sources."read-1.0.7" + (sources."readable-stream-2.3.8" // { dependencies = [ - sources."iconv-lite-0.4.24" + sources."safe-buffer-5.1.2" ]; }) - sources."read-1.0.7" - sources."readable-stream-3.6.2" 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.3.1" + sources."rfdc-1.4.1" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.4.1" - sources."semver-7.5.4" + (sources."semver-7.5.4" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) + sources."mime-1.6.0" sources."ms-2.1.3" ]; }) @@ -84253,28 +82041,37 @@ in sources."setprototypeof-1.2.0" sources."side-channel-1.0.6" sources."signal-exit-3.0.7" - sources."split2-3.2.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."statuses-2.0.1" sources."stream-shift-1.0.3" sources."streamsearch-1.1.0" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."tar-6.2.1" - sources."toidentifier-1.0.1" - (sources."tough-cookie-4.1.3" // { + (sources."string_decoder-1.1.1" // { dependencies = [ - sources."universalify-0.2.0" + sources."safe-buffer-5.1.2" ]; }) + sources."strip-ansi-6.0.1" + (sources."tar-6.2.1" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."yallist-4.0.0" + ]; + }) + sources."toidentifier-1.0.1" + sources."tough-cookie-4.1.3" sources."tr46-0.0.3" - sources."tslib-2.6.2" + sources."tslib-2.6.3" 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."universalify-2.0.1" + sources."universalify-0.2.0" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-1.5.10" @@ -84291,7 +82088,7 @@ in sources."xml2js-0.6.2" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" - sources."yallist-4.0.0" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -84507,54 +82304,6 @@ in bypassCache = true; reconstructLock = true; }; - nodemon = nodeEnv.buildNodePackage { - name = "nodemon"; - packageName = "nodemon"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz"; - sha512 = "m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w=="; - }; - dependencies = [ - sources."anymatch-3.1.3" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."chokidar-3.6.0" - sources."concat-map-0.0.1" - sources."debug-4.3.5" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" - sources."has-flag-3.0.0" - sources."ignore-by-default-1.0.1" - 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."minimatch-3.1.2" - sources."ms-2.1.2" - sources."normalize-path-3.0.0" - sources."picomatch-2.3.1" - sources."pstree.remy-1.1.8" - sources."readdirp-3.6.0" - sources."semver-7.6.2" - sources."simple-update-notifier-2.0.0" - sources."supports-color-5.5.0" - sources."to-regex-range-5.0.1" - sources."touch-3.1.1" - sources."undefsafe-2.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Simple monitor script for use during development of a Node.js app."; - homepage = "https://nodemon.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; @@ -84564,9 +82313,9 @@ in sha512 = "Tu270vVvsh92uh6XDXrGS6D94PhzxQYqM8uUxftYVp0B8qXl78dJRYwQ9wfYMOBB9ynlF79eWlUtPUxPzKGddQ=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -84977,13 +82726,13 @@ in }) (sources."read-package-up-11.0.0" // { dependencies = [ - sources."type-fest-4.19.0" + sources."type-fest-4.20.0" ]; }) (sources."read-pkg-9.0.1" // { dependencies = [ sources."parse-json-8.1.0" - sources."type-fest-4.19.0" + sources."type-fest-4.20.0" ]; }) sources."readable-stream-3.6.2" @@ -85011,7 +82760,7 @@ in sources."run-parallel-1.2.0" (sources."rxjs-7.8.1" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.6.3" ]; }) sources."safe-buffer-5.2.1" @@ -85176,10 +82925,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.29.1"; + version = "6.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.29.1.tgz"; - sha512 = "hYGuPNucbHZeQgSpcoujuR6GzRKbHhl59zFMt6bxZd6XkeEONhGAqOLETAFQ9og/arOlPOMvchy6COCnrEKlRQ=="; + url = "https://registry.npmjs.org/orval/-/orval-6.30.2.tgz"; + sha512 = "bmMfFv9N2iPFAyHxKHVPz9VCJIG4nZI5JnandGCp+W8IqRdVE4M6+XxLS6XTQR0K6pRBhaZYnj/NmCO85qYdgQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -85188,7 +82937,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.17.0" + sources."@ibm-cloud/openapi-ruleset-1.17.1" sources."@ibm-cloud/openapi-ruleset-utilities-1.3.2" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" @@ -85196,14 +82945,15 @@ 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.29.1" - sources."@orval/axios-6.29.1" - sources."@orval/core-6.29.1" - sources."@orval/hono-6.29.1" - sources."@orval/mock-6.29.1" - sources."@orval/query-6.29.1" - sources."@orval/swr-6.29.1" - sources."@orval/zod-6.29.1" + sources."@orval/angular-6.30.2" + sources."@orval/axios-6.30.2" + sources."@orval/core-6.30.2" + sources."@orval/fetch-6.30.2" + sources."@orval/hono-6.30.2" + sources."@orval/mock-6.30.2" + sources."@orval/query-6.30.2" + sources."@orval/swr-6.30.2" + sources."@orval/zod-6.30.2" sources."@stoplight/better-ajv-errors-1.0.3" sources."@stoplight/json-3.21.0" (sources."@stoplight/json-ref-readers-1.2.2" // { @@ -85217,18 +82967,19 @@ in (sources."@stoplight/spectral-core-1.18.3" // { 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.7.2" + sources."@stoplight/spectral-functions-1.8.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.18.1" + sources."@stoplight/spectral-rulesets-1.19.1" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" @@ -85243,11 +82994,11 @@ 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.1" + sources."@types/node-20.14.2" sources."@types/urijs-1.19.25" sources."abort-controller-3.0.0" - sources."acorn-8.11.3" - sources."ajv-8.15.0" + sources."acorn-8.12.0" + sources."ajv-8.16.0" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" sources."ajv-formats-2.1.1" @@ -85263,7 +83014,7 @@ in sources."available-typed-arrays-1.0.7" sources."balanced-match-1.0.2" sources."binary-extensions-2.3.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."cac-6.7.14" sources."call-bind-1.0.7" @@ -85305,7 +83056,6 @@ in sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" - sources."fast-uri-2.3.0" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."find-up-5.0.0" @@ -85382,11 +83132,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."mimic-fn-2.1.0" - (sources."minimatch-6.2.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - ]; - }) + sources."minimatch-6.2.0" sources."ms-2.1.2" (sources."nimma-0.2.2" // { dependencies = [ @@ -85410,7 +83156,7 @@ in sources."openapi-types-12.1.3" (sources."openapi3-ts-4.2.2" // { dependencies = [ - sources."yaml-2.4.3" + sources."yaml-2.4.5" ]; }) sources."p-limit-3.1.0" @@ -85421,6 +83167,7 @@ in sources."picomatch-2.3.1" sources."pony-cause-1.1.1" sources."possible-typed-array-names-1.0.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" @@ -85460,7 +83207,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tsconfck-2.1.2" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" @@ -85469,6 +83216,7 @@ in sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" sources."universalify-2.0.1" + sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.11.0" sources."validator-13.12.0" @@ -85503,9 +83251,9 @@ in sha512 = "W+gxAq7aQ9dJIg/XLKGcRT0cvnStFAQHPaI0pvD0U2l6IVLueUAm3nwN7lkY62zZNmlvNx6jNtE4wlbS+CyqSg=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -85617,14 +83365,14 @@ 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" + sources."@swc/types-0.1.8" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.11.3" + sources."acorn-8.12.0" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -85649,11 +83397,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chrome-trace-event-1.0.4" @@ -85672,8 +83420,8 @@ in sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-7.0.1" - sources."cssnano-preset-default-7.0.1" + sources."cssnano-7.0.2" + sources."cssnano-preset-default-7.0.2" sources."cssnano-utils-5.0.0" sources."csso-4.2.0" sources."cssom-0.3.8" @@ -85696,7 +83444,7 @@ in sources."dotenv-expand-5.1.0" sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-9.2.2" sources."entities-3.0.1" sources."env-paths-2.2.1" @@ -85713,7 +83461,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.1.1" + sources."foreground-child-3.2.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" @@ -85729,18 +83477,21 @@ in (sources."htmlnano-2.1.1" // { dependencies = [ sources."css-select-5.1.0" - sources."css-tree-2.3.1" + (sources."css-tree-2.3.1" // { + dependencies = [ + sources."mdn-data-2.0.30" + ]; + }) (sources."csso-5.0.5" // { dependencies = [ sources."css-tree-2.2.1" - sources."mdn-data-2.0.28" ]; }) sources."dom-serializer-2.0.0" sources."domhandler-5.0.3" sources."domutils-3.1.0" sources."entities-4.5.0" - sources."mdn-data-2.0.30" + sources."mdn-data-2.0.28" sources."srcset-5.0.1" sources."svgo-3.3.2" ]; @@ -85763,7 +83514,7 @@ in sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -85784,7 +83535,7 @@ in sources."detect-libc-1.0.3" ]; }) - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" sources."lines-and-columns-1.2.4" sources."lmdb-2.8.5" sources."lodash-4.17.21" @@ -85828,12 +83579,12 @@ in sources."postcss-discard-duplicates-7.0.0" sources."postcss-discard-empty-7.0.0" sources."postcss-discard-overridden-7.0.0" - sources."postcss-merge-longhand-7.0.0" - sources."postcss-merge-rules-7.0.0" + sources."postcss-merge-longhand-7.0.1" + sources."postcss-merge-rules-7.0.1" sources."postcss-minify-font-values-7.0.0" sources."postcss-minify-gradients-7.0.0" sources."postcss-minify-params-7.0.0" - sources."postcss-minify-selectors-7.0.0" + sources."postcss-minify-selectors-7.0.1" sources."postcss-normalize-charset-7.0.0" sources."postcss-normalize-display-values-7.0.0" sources."postcss-normalize-positions-7.0.0" @@ -85847,25 +83598,28 @@ in sources."postcss-reduce-initial-7.0.0" sources."postcss-reduce-transforms-7.0.0" sources."postcss-selector-parser-6.1.0" - (sources."postcss-svgo-7.0.0" // { + (sources."postcss-svgo-7.0.1" // { dependencies = [ sources."css-select-5.1.0" - sources."css-tree-2.3.1" + (sources."css-tree-2.3.1" // { + dependencies = [ + sources."mdn-data-2.0.30" + ]; + }) (sources."csso-5.0.5" // { dependencies = [ sources."css-tree-2.2.1" - sources."mdn-data-2.0.28" ]; }) sources."dom-serializer-2.0.0" sources."domhandler-5.0.3" sources."domutils-3.1.0" sources."entities-4.5.0" - sources."mdn-data-2.0.30" + sources."mdn-data-2.0.28" sources."svgo-3.3.2" ]; }) - sources."postcss-unique-selectors-7.0.0" + sources."postcss-unique-selectors-7.0.1" sources."postcss-value-parser-4.2.0" sources."posthtml-0.16.6" sources."posthtml-parser-0.11.0" @@ -85914,12 +83668,12 @@ in ]; }) sources."strip-ansi-cjs-6.0.1" - sources."stylehacks-7.0.0" + sources."stylehacks-7.0.1" 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.0" // { + (sources."terser-5.31.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -85928,7 +83682,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -86157,7 +83911,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.1" sources."mv-2.1.1" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" @@ -86247,7 +84001,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.17.4" + sources."uglify-js-3.18.0" sources."unix-dgram-2.0.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -86358,7 +84112,7 @@ in sources."universalify-2.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yaml-2.4.3" + sources."yaml-2.4.5" ]; buildInputs = globalBuildInputs; meta = { @@ -87103,25 +84857,6 @@ in bypassCache = true; reconstructLock = true; }; - - pnpm = nodeEnv.buildNodePackage { - name = "pnpm"; - packageName = "pnpm"; - version = "8.15.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.15.5.tgz"; - sha512 = "sFGjLH5pWDO4SSbTspuMylclS1ifBknYmcbp0O22cLkex+KkNFm65zdZu1zmGcMmbxFr+THOItHvF1mn5Fqpbw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { name = "poor-mans-t-sql-formatter-cli"; packageName = "poor-mans-t-sql-formatter-cli"; @@ -87197,7 +84932,7 @@ in sources."color-name-1.1.4" sources."dependency-graph-0.11.0" sources."emoji-regex-8.0.0" - sources."esbuild-0.20.2" + sources."esbuild-0.21.5" sources."escalade-3.1.2" sources."fast-glob-3.3.2" sources."fastq-1.17.1" @@ -87215,9 +84950,9 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.21.0" + sources."jiti-1.21.6" sources."jsonfile-6.1.0" - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."nanoid-3.3.7" @@ -87243,12 +84978,12 @@ in sources."strip-ansi-6.0.1" sources."thenby-1.3.4" sources."to-regex-range-5.0.1" - sources."tsx-4.11.2" + sources."tsx-4.15.4" 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.4.3" + sources."yaml-2.4.5" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -87289,7 +85024,7 @@ in sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" @@ -87319,10 +85054,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz"; - sha512 = "J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz"; + sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA=="; }; buildInputs = globalBuildInputs; meta = { @@ -87345,7 +85080,7 @@ in dependencies = [ sources."@taplo/core-0.1.1" sources."@taplo/lib-0.4.0-alpha.2" - sources."prettier-3.3.0" + sources."prettier-3.3.2" ]; buildInputs = globalBuildInputs; meta = { @@ -87360,17 +85095,17 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-5.14.0.tgz"; - sha512 = "gCNZco7y5XtjrnQYeDJTiVZmT/ncqCr5RY1/Cf8X2wgLRmyh9ayPAGBNziI4qEE4S6SxCH5omQLVo9lmURaJ/Q=="; + url = "https://registry.npmjs.org/prisma/-/prisma-5.15.0.tgz"; + sha512 = "JA81ACQSCi3a7NUOgonOIkdx8PAVkO+HbUOxmd00Yb8DgIIEpr2V9+Qe/j6MLxIgWtE/OtVQ54rVjfYRbZsCfw=="; }; dependencies = [ - sources."@prisma/debug-5.14.0" - sources."@prisma/engines-5.14.0" - sources."@prisma/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48" - sources."@prisma/fetch-engine-5.14.0" - sources."@prisma/get-platform-5.14.0" + sources."@prisma/debug-5.15.0" + sources."@prisma/engines-5.15.0" + sources."@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" + sources."@prisma/fetch-engine-5.15.0" + sources."@prisma/get-platform-5.15.0" ]; buildInputs = globalBuildInputs; meta = { @@ -87385,184 +85120,27 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "5.14.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.14.0.tgz"; - sha512 = "bukQelNJ8Kvj6+Rf7i8591DMu3X40DYUXGJ2eWSberZc+inbRBwlETMvzRgOoQkCVxWIt0FfFXudvatkGN5NHw=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.15.0.tgz"; + sha512 = "hcYw8VCycw1TPrTVZGs9AaAXepj8tmsyDE7RaOUD8Csydbz9g4fqeNo/zHrY9KPjiTMwVvTNVknArt5nWCvPYQ=="; }; dependencies = [ - sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - (sources."@babel/core-7.24.6" // { - dependencies = [ - sources."convert-source-map-2.0.0" - ]; - }) - sources."@babel/generator-7.24.6" - sources."@babel/helper-compilation-targets-7.24.6" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" - sources."@istanbuljs/load-nyc-config-1.1.0" - sources."@istanbuljs/schema-0.1.3" - 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.4.15" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@prisma/prisma-schema-wasm-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48" + sources."@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" + sources."@prisma/schema-files-loader-5.15.0" sources."@types/js-levenshtein-1.1.3" - sources."aggregate-error-3.1.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."append-transform-2.0.0" - sources."archy-1.0.0" - sources."argparse-1.0.10" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."browserslist-4.23.0" - sources."caching-transform-4.0.0" - sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001627" - sources."chalk-2.4.2" - sources."clean-stack-2.2.0" - sources."cliui-6.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" - sources."cross-spawn-7.0.3" - sources."debug-4.3.5" - sources."decamelize-1.2.0" - sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.789" - sources."emoji-regex-8.0.0" - sources."es6-error-4.1.1" - sources."escalade-3.1.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."foreground-child-2.0.0" - sources."fromentries-1.3.2" - sources."fs.realpath-1.0.0" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-package-type-0.1.0" - sources."glob-7.2.3" - sources."globals-11.12.0" + sources."fs-extra-11.1.1" sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."hasha-5.2.2" - sources."html-escaper-2.0.2" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" - sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.2" - sources."istanbul-lib-hook-3.0.0" - sources."istanbul-lib-instrument-4.0.3" - sources."istanbul-lib-processinfo-2.0.3" - (sources."istanbul-lib-report-3.0.1" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."make-dir-4.0.0" - sources."semver-7.6.2" - sources."supports-color-7.2.0" - ]; - }) - sources."istanbul-lib-source-maps-4.0.1" - sources."istanbul-reports-3.1.7" sources."js-levenshtein-1.1.6" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsesc-2.5.2" - sources."json5-2.2.3" + sources."jsonfile-6.1.0" sources."klona-2.0.6" - sources."locate-path-5.0.0" - sources."lodash.flattendeep-4.4.0" - sources."lru-cache-5.1.1" - sources."make-dir-3.1.0" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."node-preload-0.2.1" - sources."node-releases-2.0.14" - sources."nyc-15.1.0" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-3.0.0" - sources."p-try-2.2.0" - sources."package-hash-4.0.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."picocolors-1.0.1" - sources."pkg-dir-4.2.0" - sources."process-on-spawn-1.0.0" - sources."release-zalgo-1.0.0" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-from-5.0.0" - sources."rimraf-3.0.2" - sources."semver-6.3.1" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."spawn-wrap-2.0.0" - sources."sprintf-js-1.0.3" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-bom-4.0.0" - sources."supports-color-5.5.0" - sources."test-exclude-6.0.0" - sources."to-fast-properties-2.0.0" - sources."type-fest-0.8.1" - sources."typedarray-to-buffer-3.1.5" - sources."update-browserslist-db-1.0.16" - sources."uuid-8.3.2" + sources."universalify-2.0.1" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.3" - sources."which-2.0.2" - sources."which-module-2.0.1" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."y18n-4.0.3" - sources."yallist-3.1.1" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."vscode-uri-3.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -87598,7 +85176,7 @@ in }) sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" (sources."glob-10.4.1" // { @@ -87616,7 +85194,7 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."keypress-0.2.1" sources."lodash-4.17.21" sources."lru-cache-10.2.2" @@ -88220,11 +85798,11 @@ in sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."glob-10.4.1" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."lru-cache-10.2.2" sources."minimatch-9.0.4" sources."minipass-7.1.2" @@ -88316,11 +85894,11 @@ in sources."@azure/abort-controller-2.1.2" ]; }) - sources."@azure/identity-4.2.0" + sources."@azure/identity-4.2.1" sources."@azure/logger-1.1.2" - sources."@azure/msal-browser-3.16.0" - sources."@azure/msal-common-14.11.0" - sources."@azure/msal-node-2.9.1" + sources."@azure/msal-browser-3.17.0" + sources."@azure/msal-common-14.12.0" + sources."@azure/msal-node-2.9.2" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.1" (sources."@eslint/eslintrc-2.1.4" // { @@ -88362,7 +85940,7 @@ in sources."@typescript-eslint/visitor-keys-6.21.0" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.4.0" - (sources."@vscode/vsce-2.26.1" // { + (sources."@vscode/vsce-2.27.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."brace-expansion-1.1.11" @@ -88373,7 +85951,17 @@ in sources."minimatch-3.1.2" ]; }) - sources."acorn-8.11.3" + sources."@vscode/vsce-sign-2.0.4" + sources."@vscode/vsce-sign-alpine-arm64-2.0.2" + sources."@vscode/vsce-sign-alpine-x64-2.0.2" + sources."@vscode/vsce-sign-darwin-arm64-2.0.2" + sources."@vscode/vsce-sign-darwin-x64-2.0.2" + sources."@vscode/vsce-sign-linux-arm-2.0.2" + sources."@vscode/vsce-sign-linux-arm64-2.0.2" + sources."@vscode/vsce-sign-linux-x64-2.0.2" + sources."@vscode/vsce-sign-win32-arm64-2.0.2" + sources."@vscode/vsce-sign-win32-x64-2.0.2" + sources."acorn-8.12.0" sources."acorn-jsx-5.3.2" sources."agent-base-7.1.1" sources."ajv-6.12.6" @@ -88609,7 +86197,7 @@ in sources."mute-stream-0.0.8" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" sources."object-inspect-1.13.1" @@ -88649,7 +86237,7 @@ in sources."picomatch-2.3.1" sources."prebuild-install-7.1.2" sources."prelude-ls-1.2.1" - sources."prettier-3.3.0" + sources."prettier-3.3.2" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" sources."punycode-2.3.1" @@ -88698,7 +86286,7 @@ in sources."tmp-0.2.3" sources."to-regex-range-5.0.1" sources."ts-api-utils-1.3.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."type-check-0.4.0" @@ -88739,10 +86327,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.77.4"; + version = "1.77.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.4.tgz"; - sha512 = "vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz"; + sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -89249,7 +86837,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mv-2.1.1" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -89355,7 +86943,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.1" + sources."@types/node-20.14.2" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" @@ -89396,9 +86984,9 @@ in sha512 = "CIlLQsG8ffQ2B+2A/s3rXiaTXDWlEKBMya64ajzDcpDZ8bpB5dOyznWQJB+lyUn6/lJ8P+5xe4jKO60S6yLoMw=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -89608,27 +87196,42 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.6" - sources."@babel/compat-data-7.24.6" - sources."@babel/core-7.24.6" - sources."@babel/generator-7.24.6" - sources."@babel/helper-compilation-targets-7.24.6" - sources."@babel/helper-environment-visitor-7.24.6" - sources."@babel/helper-function-name-7.24.6" - sources."@babel/helper-hoist-variables-7.24.6" - sources."@babel/helper-module-imports-7.24.6" - sources."@babel/helper-module-transforms-7.24.6" - sources."@babel/helper-simple-access-7.24.6" - sources."@babel/helper-split-export-declaration-7.24.6" - sources."@babel/helper-string-parser-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/helper-validator-option-7.24.6" - sources."@babel/helpers-7.24.6" - sources."@babel/highlight-7.24.6" - sources."@babel/parser-7.24.6" - sources."@babel/template-7.24.6" - sources."@babel/traverse-7.24.6" - sources."@babel/types-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.7" + (sources."@babel/core-7.24.7" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.24.7" + (sources."@babel/helper-compilation-targets-7.24.7" // { + 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.7" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helpers-7.24.7" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.24.7" + sources."@babel/template-7.24.7" + (sources."@babel/traverse-7.24.7" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) + sources."@babel/types-7.24.7" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -89642,7 +87245,7 @@ in sources."acorn-7.4.1" (sources."acorn-typescript-1.4.13" // { dependencies = [ - sources."acorn-8.11.3" + sources."acorn-8.12.0" ]; }) sources."ansi-styles-3.2.1" @@ -89657,11 +87260,11 @@ in sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.0" - sources."buffer-crc32-0.2.13" + sources."browserslist-4.23.1" + sources."buffer-crc32-1.0.0" sources."call-bind-1.0.7" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.6.0" @@ -89673,18 +87276,18 @@ in sources."convert-source-map-2.0.0" sources."copy-anything-2.0.6" sources."css-3.0.0" - sources."debug-4.3.5" + 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.4.789" + sources."electron-to-chromium-1.4.802" 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.20.2" + sources."esbuild-0.21.5" sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."esm-env-1.0.0" @@ -89724,22 +87327,18 @@ in sources."is-reference-3.0.2" sources."is-regex-1.1.4" sources."is-what-3.14.1" - sources."jiti-1.21.0" + 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.1" + 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" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) + sources."make-dir-2.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."mime-1.6.0" @@ -89748,7 +87347,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mri-1.2.0" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."nanoid-3.3.7" sources."needle-3.3.1" sources."node-releases-2.0.14" @@ -89789,45 +87388,44 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.77.4" + sources."sass-1.77.5" sources."sax-1.4.1" - sources."semver-6.3.1" + sources."semver-5.7.2" sources."set-function-length-1.2.2" - sources."sorcery-0.11.0" + 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."debug-3.1.0" sources."mkdirp-1.0.4" - sources."ms-2.0.0" 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.149" // { + (sources."svelte-5.0.0-next.155" // { dependencies = [ - sources."acorn-8.11.3" + sources."acorn-8.12.0" ]; }) sources."svelte-preprocess-5.1.4" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" - sources."tslib-2.6.2" - sources."tsx-4.11.2" + sources."tslib-2.6.3" + sources."tsx-4.15.4" sources."typescript-5.4.5" sources."update-browserslist-db-1.0.16" sources."void-elements-3.1.0" sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."zimmerframe-1.1.2" ]; buildInputs = globalBuildInputs; @@ -89853,12 +87451,15 @@ in sources."boolbase-1.0.0" sources."commander-7.2.0" sources."css-select-5.1.0" - sources."css-tree-2.3.1" + (sources."css-tree-2.3.1" // { + dependencies = [ + sources."mdn-data-2.0.30" + ]; + }) sources."css-what-6.1.0" (sources."csso-5.0.5" // { dependencies = [ sources."css-tree-2.2.1" - sources."mdn-data-2.0.28" ]; }) sources."dom-serializer-2.0.0" @@ -89866,7 +87467,7 @@ in sources."domhandler-5.0.3" sources."domutils-3.1.0" sources."entities-4.5.0" - sources."mdn-data-2.0.30" + sources."mdn-data-2.0.28" sources."nth-check-2.1.1" sources."picocolors-1.0.1" sources."source-map-js-1.2.0" @@ -89884,10 +87485,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz"; - sha512 = "U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz"; + sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -89905,18 +87506,18 @@ in 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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -89950,7 +87551,7 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."function-bind-1.1.2" sources."glob-10.4.1" sources."glob-parent-6.0.2" @@ -89962,8 +87563,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" - sources."jiti-1.21.0" + sources."jackspeak-3.4.0" + sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lru-cache-10.2.2" @@ -89989,7 +87590,7 @@ in sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.1.1" + sources."lilconfig-3.1.2" ]; }) sources."postcss-nested-6.0.1" @@ -90029,7 +87630,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" @@ -90044,7 +87645,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -90149,7 +87750,7 @@ 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.1" + sources."@types/node-20.14.2" sources."@types/responselike-1.0.3" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -90686,7 +88287,7 @@ in sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.19.0" + sources."nan-2.20.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" @@ -91117,7 +88718,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.1" + sources."@types/node-20.14.2" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -91588,7 +89189,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.1" + sources."@types/node-20.14.2" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -92521,23 +90122,23 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" 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.1" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."@types/node-20.14.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" 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.2" + sources."tslib-2.6.3" sources."typescript-5.4.5" sources."undici-types-5.26.5" sources."v8-compile-cache-lib-3.0.1" @@ -92594,10 +90195,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.17.4"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz"; - sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; + sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; }; buildInputs = globalBuildInputs; meta = { @@ -92636,9 +90237,9 @@ in sha512 = "cWjMoW3QcUCtJfQ1ifms2qz8fbO9fuT4YizOSDmv299khazt2e3e5jtJ1fUBBN1zKY/EWir7ZfK+4ffj5xe7Wg=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - sources."@babel/highlight-7.24.6" + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/highlight-7.24.7" sources."@isaacs/cliui-8.0.2" sources."@npmcli/config-8.3.3" sources."@npmcli/map-workspaces-3.0.6" @@ -92647,7 +90248,7 @@ in sources."@types/debug-4.1.12" sources."@types/is-empty-1.2.3" sources."@types/ms-0.7.34" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/supports-color-8.1.3" sources."@types/unist-3.0.2" sources."abbrev-2.0.0" @@ -92675,7 +90276,7 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."find-up-6.3.0" - sources."foreground-child-3.1.1" + sources."foreground-child-3.2.0" sources."glob-10.4.1" sources."has-flag-3.0.0" sources."ignore-5.3.1" @@ -92687,7 +90288,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-4.1.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.2" sources."lines-and-columns-2.0.4" @@ -92765,7 +90366,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.3" + sources."yaml-2.4.5" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -92865,7 +90466,7 @@ in }) sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nan-2.19.0" + sources."nan-2.20.0" sources."node-fetch-2.7.0" sources."nopt-5.0.0" sources."npmlog-5.0.1" @@ -92897,34 +90498,34 @@ in sources."util-deprecate-1.0.2" sources."vega-5.29.0" sources."vega-canvas-1.2.7" - sources."vega-crossfilter-4.1.1" - sources."vega-dataflow-5.7.5" - sources."vega-encode-4.10.0" + sources."vega-crossfilter-4.1.2" + sources."vega-dataflow-5.7.6" + sources."vega-encode-4.10.1" sources."vega-event-selector-3.0.1" - sources."vega-expression-5.1.0" - sources."vega-force-4.2.0" - sources."vega-format-1.1.1" + sources."vega-expression-5.1.1" + sources."vega-force-4.2.1" + sources."vega-format-1.1.2" sources."vega-functions-5.14.0" - sources."vega-geo-4.4.1" - sources."vega-hierarchy-4.1.1" + sources."vega-geo-4.4.2" + sources."vega-hierarchy-4.1.2" sources."vega-label-1.2.1" - sources."vega-loader-4.5.1" + sources."vega-loader-4.5.2" sources."vega-parser-6.3.0" - sources."vega-projection-1.6.0" + sources."vega-projection-1.6.1" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.4.0" + sources."vega-scale-7.4.1" sources."vega-scenegraph-4.12.0" sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" - sources."vega-time-2.1.1" + sources."vega-time-2.1.2" sources."vega-transforms-4.11.1" sources."vega-typings-1.1.0" sources."vega-util-1.17.2" sources."vega-view-5.12.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.2" - sources."vega-wordcloud-4.1.4" + sources."vega-voronoi-4.2.3" + sources."vega-wordcloud-4.1.5" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" @@ -92948,10 +90549,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.18.1"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.18.1.tgz"; - sha512 = "TcwEUqymDjLC+eWyXJzpOd7OnHvYH1SiVqjj9r22BSq5N0I6f0rodxtgQOoX3NJFpJp84E7V8o/jDVDjeo+zxA=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.19.0.tgz"; + sha512 = "DtSArHnomfYdKnkz7rDCLkXpuh4O6kHVU1YSDoMtQR0ewEwqelb5YY85mvJPCJRT9E7UG84RGdxjDbuwowtHRg=="; }; dependencies = [ sources."@types/estree-1.0.5" @@ -93003,37 +90604,37 @@ in ]; }) sources."tr46-0.0.3" - sources."tslib-2.6.2" - sources."vega-5.29.0" + sources."tslib-2.6.3" + sources."vega-5.30.0" sources."vega-canvas-1.2.7" - sources."vega-crossfilter-4.1.1" - sources."vega-dataflow-5.7.5" - sources."vega-encode-4.10.0" + sources."vega-crossfilter-4.1.2" + sources."vega-dataflow-5.7.6" + sources."vega-encode-4.10.1" sources."vega-event-selector-3.0.1" - sources."vega-expression-5.1.0" - sources."vega-force-4.2.0" - sources."vega-format-1.1.1" - sources."vega-functions-5.14.0" - sources."vega-geo-4.4.1" - sources."vega-hierarchy-4.1.1" - sources."vega-label-1.2.1" - sources."vega-loader-4.5.1" - sources."vega-parser-6.3.0" - sources."vega-projection-1.6.0" - sources."vega-regression-1.2.0" - sources."vega-runtime-6.1.4" - sources."vega-scale-7.4.0" - sources."vega-scenegraph-4.12.0" + sources."vega-expression-5.1.1" + sources."vega-force-4.2.1" + sources."vega-format-1.1.2" + sources."vega-functions-5.15.0" + sources."vega-geo-4.4.2" + sources."vega-hierarchy-4.1.2" + sources."vega-label-1.3.0" + sources."vega-loader-4.5.2" + sources."vega-parser-6.4.0" + sources."vega-projection-1.6.1" + sources."vega-regression-1.3.0" + sources."vega-runtime-6.2.0" + sources."vega-scale-7.4.1" + sources."vega-scenegraph-4.13.0" sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" - sources."vega-time-2.1.1" - sources."vega-transforms-4.11.1" - sources."vega-typings-1.1.0" + sources."vega-time-2.1.2" + sources."vega-transforms-4.12.0" + sources."vega-typings-1.3.1" sources."vega-util-1.17.2" - sources."vega-view-5.12.1" - sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.2" - sources."vega-wordcloud-4.1.4" + sources."vega-view-5.13.0" + sources."vega-view-transforms-4.6.0" + sources."vega-voronoi-4.2.3" + sources."vega-wordcloud-4.1.5" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrap-ansi-7.0.0" @@ -93054,10 +90655,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "34.2.4"; + version = "34.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-34.2.4.tgz"; - sha512 = "C6YQrshh+gpNngQf0Nj1Uhopj/hhxmsBaUKBj1M8vmY8p8d3EmgZ+Q/6erjnqY+S7+QLkEtp0st6wZ7VhA+hJQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-34.2.7.tgz"; + sha512 = "cc6NmaPeLhg7UJuuI6jKu92xppVYbuZRtQib/hDEaEPFSZgiUNw0sbtRfbzvXUZjxzJeLNeSGKLwazBbpXOvkQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -93093,11 +90694,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.5.24" + sources."@swc/core-1.5.29" sources."@swc/counter-0.1.3" sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.7" - sources."@swc/wasm-1.5.24" + sources."@swc/types-0.1.8" + sources."@swc/wasm-1.5.29" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -93110,11 +90711,11 @@ 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.2.1" + sources."@vercel/build-utils-8.2.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.32" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.33" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" @@ -93123,9 +90724,9 @@ in }) sources."@vercel/go-3.1.1" sources."@vercel/hydrogen-1.0.2" - sources."@vercel/next-4.2.14" - sources."@vercel/nft-0.27.0" - (sources."@vercel/node-3.1.6" // { + sources."@vercel/next-4.2.17" + sources."@vercel/nft-0.27.2" + (sources."@vercel/node-3.1.7" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" @@ -93133,12 +90734,12 @@ in ]; }) sources."@vercel/python-4.3.0" - (sources."@vercel/redwood-2.0.9" // { + (sources."@vercel/redwood-2.0.10" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.1.6" + sources."@vercel/remix-builder-2.1.7" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -93147,12 +90748,12 @@ in ]; }) sources."@vercel/ruby-2.1.0" - sources."@vercel/static-build-2.5.10" + sources."@vercel/static-build-2.5.11" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" - sources."acorn-8.11.3" + sources."acorn-8.12.0" sources."acorn-import-attributes-1.9.5" - sources."acorn-walk-8.3.2" + sources."acorn-walk-8.3.3" sources."agent-base-6.0.2" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" @@ -93355,7 +90956,7 @@ in sources."ts-morph-12.0.0" sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."typescript-4.9.5" sources."uid-promise-1.0.0" sources."undici-5.26.5" @@ -93389,24 +90990,6 @@ in bypassCache = true; reconstructLock = true; }; - vim-language-server = nodeEnv.buildNodePackage { - name = "vim-language-server"; - packageName = "vim-language-server"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.3.1.tgz"; - sha512 = "Y9Zy3NKzfndLUfuZRrITkpfGvpL2K7hNPV8sJ1iB6mf1YRxIX3Hs6lwZimoD5pmvamUaOQhNGYMS/Ox9itzA4Q=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "vim language server"; - homepage = "https://github.com/iamcco/vim-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; @@ -93416,9 +90999,9 @@ in sha512 = "61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA=="; }; dependencies = [ - sources."@babel/code-frame-7.24.6" - sources."@babel/helper-validator-identifier-7.24.6" - (sources."@babel/highlight-7.24.6" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/helper-validator-identifier-7.24.7" + (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -93440,7 +91023,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ungap/structured-clone-1.2.0" - sources."acorn-8.11.3" + sources."acorn-8.12.0" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -93773,7 +91356,7 @@ in sha512 = "KX07T/WHnXfmoo2wvjLlx0eKeGIotB0C5GnfWVHylPfSa7BuNo0bktRCL2+zJ3g72IKc1psuRIGZIn7/soexag=="; }; dependencies = [ - (sources."@babel/runtime-7.24.6" // { + (sources."@babel/runtime-7.24.7" // { dependencies = [ sources."regenerator-runtime-0.14.1" ]; @@ -93905,10 +91488,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz"; - sha512 = "rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz"; + sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.5" @@ -93921,7 +91504,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -93939,17 +91522,17 @@ in sources."@webassemblyjs/wast-printer-1.12.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.11.3" - sources."acorn-import-assertions-1.9.0" + sources."acorn-8.12.0" + sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.789" - sources."enhanced-resolve-5.16.1" + sources."electron-to-chromium-1.4.802" + sources."enhanced-resolve-5.17.0" sources."es-module-lexer-1.5.3" sources."escalade-3.1.2" sources."eslint-scope-5.1.1" @@ -93984,13 +91567,13 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.0" + sources."terser-5.31.1" sources."terser-webpack-plugin-5.3.10" sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.16" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - sources."webpack-5.91.0" + sources."webpack-5.92.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -94023,7 +91606,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -94044,20 +91627,20 @@ in sources."@webpack-cli/serve-2.0.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.11.3" - sources."acorn-import-assertions-1.9.0" + sources."acorn-8.12.0" + sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" 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.4.789" - sources."enhanced-resolve-5.16.1" + sources."electron-to-chromium-1.4.802" + sources."enhanced-resolve-5.17.0" sources."envinfo-7.13.0" sources."es-module-lexer-1.5.3" sources."escalade-3.1.2" @@ -94121,7 +91704,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.31.0" // { + (sources."terser-5.31.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -94131,7 +91714,7 @@ in sources."update-browserslist-db-1.0.16" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - sources."webpack-5.91.0" + sources."webpack-5.92.0" sources."webpack-cli-5.1.4" sources."webpack-merge-5.10.0" sources."webpack-sources-3.2.3" @@ -94181,7 +91764,7 @@ in sources."@types/http-proxy-1.17.14" sources."@types/json-schema-7.0.15" sources."@types/mime-1.3.5" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.15" sources."@types/range-parser-1.2.7" @@ -94209,9 +91792,9 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.11.3" - sources."acorn-import-assertions-1.9.0" - sources."ajv-8.15.0" + sources."acorn-8.12.0" + sources."acorn-import-attributes-1.9.5" + sources."ajv-8.16.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" @@ -94230,13 +91813,13 @@ in sources."bonjour-service-1.2.1" sources."brace-expansion-2.0.1" sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bundle-name-4.1.0" sources."bytes-3.0.0" sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."chokidar-3.6.0" sources."chrome-trace-event-1.0.4" sources."color-convert-2.0.1" @@ -94268,10 +91851,10 @@ in sources."dns-packet-5.6.1" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.789" + sources."electron-to-chromium-1.4.802" sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" - sources."enhanced-resolve-5.16.1" + sources."enhanced-resolve-5.17.0" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."es-module-lexer-1.5.3" @@ -94295,12 +91878,11 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-uri-2.3.0" sources."faye-websocket-0.11.4" sources."fill-range-7.1.1" sources."finalhandler-1.2.0" sources."follow-redirects-1.15.6" - (sources."foreground-child-3.1.1" // { + (sources."foreground-child-3.2.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -94350,7 +91932,7 @@ in sources."is-wsl-3.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.2.3" + sources."jackspeak-3.4.0" sources."jest-worker-27.5.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" @@ -94476,7 +92058,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.0" + sources."terser-5.31.1" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -94490,7 +92072,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tree-dump-1.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."type-is-1.6.18" sources."undici-types-5.26.5" sources."unpipe-1.0.0" @@ -94503,7 +92085,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.1" sources."wbuf-1.7.3" - (sources."webpack-5.91.0" // { + (sources."webpack-5.92.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -94560,7 +92142,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -94578,19 +92160,19 @@ in sources."@webassemblyjs/wast-printer-1.12.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.11.3" - sources."acorn-import-assertions-1.9.0" - sources."ajv-8.15.0" + sources."acorn-8.12.0" + sources."acorn-import-attributes-1.9.5" + sources."ajv-8.16.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.3" - sources."browserslist-4.23.0" + sources."browserslist-4.23.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001627" + sources."caniuse-lite-1.0.30001634" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.789" - sources."enhanced-resolve-5.16.1" + sources."electron-to-chromium-1.4.802" + sources."enhanced-resolve-5.17.0" sources."es-module-lexer-1.5.3" sources."escalade-3.1.2" sources."eslint-scope-5.1.1" @@ -94608,7 +92190,6 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."fast-uri-2.3.0" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."glob-parent-6.0.2" @@ -94649,7 +92230,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.0" + sources."terser-5.31.1" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -94664,7 +92245,7 @@ in sources."update-browserslist-db-1.0.16" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - (sources."webpack-5.91.0" // { + (sources."webpack-5.92.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -94687,10 +92268,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-5.1.0.tgz"; - sha512 = "htNzXHf6sIDSsEVCPbVLe2/5o6bMWrvK2MfUaxEn6gTu0d1pBfBDyHertQ+9B1rWPtSQQHhyV6DekXz4HlpMLA=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-5.1.2.tgz"; + sha512 = "If6MahZThhkXl8tr+VE3nG/BueTm/GCNpCT5ScM+wPe8RP6JYkLLyPAzHTScM/MUOrRNOiLLe+t7FuIZ5uBWTg=="; }; dependencies = [ (sources."@silentbot1/nat-api-0.4.7" // { @@ -94721,7 +92302,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."b4a-1.6.6" - sources."bare-events-2.3.1" + sources."bare-events-2.4.2" sources."base64-arraybuffer-1.0.2" sources."base64-js-1.5.1" sources."bencode-4.0.0" @@ -94901,7 +92482,7 @@ in sources."napi-build-utils-1.0.2" sources."netmask-2.0.2" sources."network-address-1.1.2" - sources."node-abi-3.63.0" + sources."node-abi-3.65.0" (sources."node-datachannel-0.9.1" // { dependencies = [ sources."node-domexception-2.0.1" @@ -94999,7 +92580,7 @@ in ]; }) sources."torrent-piece-3.0.0" - sources."tslib-2.6.2" + sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" @@ -95021,7 +92602,7 @@ in sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.3.3" sources."webrtc-polyfill-1.1.6" - (sources."webtorrent-2.3.6" // { + (sources."webtorrent-2.4.1" // { dependencies = [ sources."bep53-range-2.0.0" sources."debug-4.3.5" @@ -95055,14 +92636,14 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.58.0"; + version = "3.60.3"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.58.0.tgz"; - sha512 = "h9gWER7LXLnmHABDNP1p3aqXtchlvSBN8Dp22ZurnkxaLMZ3L3H1Ze1ftiFSs0VRWv0BUnz7AWIUqZmzuBY4Nw=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.60.3.tgz"; + sha512 = "a6zn/KFnYaYp3nxJR/aP0TeaBvJDkrrfI89KoxUtx28H7zpya/5/VLu3CxQ3PRspEojJGF0s6f3/pddRy3F+BQ=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.3.2" - sources."@cloudflare/workers-types-4.20240603.0" + sources."@cloudflare/workers-types-4.20240605.0" sources."@cspotcode/source-map-support-0.8.1" sources."@esbuild-plugins/node-globals-polyfill-0.2.3" sources."@esbuild-plugins/node-modules-polyfill-0.2.2" @@ -95092,10 +92673,10 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@types/node-20.14.1" + sources."@types/node-20.14.2" sources."@types/node-forge-1.3.11" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."acorn-8.12.0" + sources."acorn-walk-8.3.3" sources."anymatch-3.1.3" sources."as-table-1.0.55" sources."binary-extensions-2.3.0" @@ -95104,9 +92685,11 @@ in sources."bufferutil-4.0.8" sources."capnp-ts-0.7.0" sources."chokidar-3.6.0" + sources."consola-3.2.3" sources."cookie-0.5.0" sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.5" + sources."defu-6.1.4" sources."esbuild-0.17.19" sources."escape-string-regexp-4.0.0" sources."estree-walker-0.6.1" @@ -95125,15 +92708,17 @@ in sources."is-number-7.0.0" sources."magic-string-0.25.9" sources."mime-3.0.0" - sources."miniflare-3.20240524.1" + sources."miniflare-3.20240610.0" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.7" + sources."node-fetch-native-1.6.4" sources."node-forge-1.3.1" sources."node-gyp-build-4.8.1" sources."normalize-path-3.0.0" sources."path-parse-1.0.7" sources."path-to-regexp-6.2.2" + sources."pathe-1.1.2" sources."picomatch-2.3.1" sources."printable-characters-1.0.42" sources."readdirp-3.6.0" @@ -95149,11 +92734,13 @@ in sources."stoppable-1.1.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.6.3" + sources."ufo-1.5.3" sources."undici-5.28.4" sources."undici-types-5.26.5" + sources."unenv-1.10.0-1717606461.a117952" sources."utf-8-validate-6.0.4" - sources."workerd-1.20240524.0" + sources."workerd-1.20240610.1" sources."ws-8.17.0" sources."xxhash-wasm-1.0.2" sources."youch-3.3.3" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index 7021dbb0df..c725197bdd 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -217,25 +217,6 @@ final: prev: { ''; }; - pnpm = prev.pnpm.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - - preRebuild = '' - sed 's/"link:/"file:/g' --in-place package.json - ''; - - postInstall = let - pnpmLibPath = lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - postcss-cli = prev.postcss-cli.override (oldAttrs: let esbuild-version = (lib.findFirst (dep: dep.name == "esbuild") null oldAttrs.dependencies).version; esbuild-linux-x64 = { @@ -448,11 +429,6 @@ final: prev: { }; }; - volar = final."@volar/vue-language-server".override ({ meta, ... }: { - name = "volar"; - meta = meta // { mainProgram = "vue-language-server"; }; - }); - wavedrom-cli = prev.wavedrom-cli.override { nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ]; # These dependencies are required by diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index 559b4fe62c..6a4ed92cc0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchurl , ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk -, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf +, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct , rresult, mtime, logs, fmt, cmdliner, base64 , zarith }: @@ -17,11 +17,15 @@ buildDunePackage rec { hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk="; }; + postPatch = '' + substituteInPlace lib/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; + propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime logs base64 zarith - ppx_sexp_conv eqaf + ppx_sexp_conv eqaf-cstruct ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index d678c12918..980c68298a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -16,6 +16,7 @@ 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="; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/cstruct.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/cstruct.nix new file mode 100644 index 0000000000..b5f2f6e666 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/cstruct.nix @@ -0,0 +1,9 @@ +{ buildDunePackage, eqaf, cstruct }: + +buildDunePackage { + pname = "eqaf-cstruct"; + + inherit (eqaf) src version meta; + + propagatedBuildInputs = [ cstruct eqaf ]; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix index d777755253..9b5dadb7b7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix @@ -1,18 +1,15 @@ -{ lib, fetchurl, buildDunePackage, cstruct }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { minimalOCamlVersion = "4.07"; - duneVersion = "3"; pname = "eqaf"; - version = "0.9"; + version = "0.10"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; - hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; + hash = "sha256-Z9E2nFfE0tFKENAmMtReNVIkq+uYrsCJecC65YQwku4="; }; - propagatedBuildInputs = [ cstruct ]; - meta = { description = "Constant time equal function to avoid timing attacks in OCaml"; homepage = "https://github.com/mirage/eqaf"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 74e9a455be..7057d89806 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit2, dune-configurator, eqaf-cstruct, pkg-config , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { minimalOCamlVersion = "4.08"; - duneVersion = "3"; pname = "mirage-crypto"; version = "0.11.3"; @@ -21,11 +20,16 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - cstruct eqaf + eqaf-cstruct ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; + # Compatibility with eqaf 0.10 + postPatch = '' + substituteInPlace src/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; + meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index e50838e50b..11f09dfd51 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,16 +1,18 @@ { buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng -, cstruct, sexplib0, zarith, eqaf, gmp }: +, cstruct, sexplib0, zarith, eqaf-cstruct, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src; - duneVersion = "3"; + postPatch = '' + substituteInPlace pk/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng - zarith eqaf sexplib0 ]; + zarith eqaf-cstruct sexplib0 ]; doCheck = true; checkInputs = [ ounit2 randomconv ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix index 13fad457e2..fe7e655ba6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "printbox"; - version = "0.6.1"; + version = "0.11"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; + sha256 = "sha256-f5iTesEakULlLdDGtX+5i3vesUIbFLjcV3kJ7ZPia0Y="; }; nativeCheckInputs = [ mdx.bin ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix index ee5e7d2774..c6c5abfb7f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -1,7 +1,10 @@ -{ re, reason, pastel, ... }: +{ lib, buildDunePackage, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "cli"; + version = "0.0.1-alpha-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -11,4 +14,11 @@ re pastel ]; + + meta = { + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix index a39ba9a7e3..38d95a0c0f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix @@ -1,21 +1,24 @@ -{ buildDunePackage, callPackage, reason, console, ... }: +{ lib, buildDunePackage, callPackage, reason, console, src }: + +buildDunePackage { + inherit src; -{ pname = "console"; + version = "0.1.0-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; passthru.tests = { - console = callPackage ./tests/console { - inherit buildDunePackage reason console; - }; + console = callPackage ./tests/console { }; }; meta = { description = "Library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; homepage = "https://reason-native.com/docs/console/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix index 024783cf61..b44e63080e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix @@ -1,43 +1,47 @@ -{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }: +{ + lib, + newScope, + fetchFromGitHub, + atdgen, + buildDunePackage, + junit, + ppxlib, + qcheck-core, + re, + reason, +}: -let - generic = (somePath: - let - prepkg = import somePath { - inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch; - inherit (reason-native) console file-context-printer fp pastel rely; - }; - in - buildDunePackage - ({ - version = "2022-08-31-a0ddab6"; - src = fetchFromGitHub { - owner = "reasonml"; - repo = "reason-native"; - rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a"; - hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8="; - }; - duneVersion = "3"; - meta = with lib; { - description = "Libraries for building and testing native Reason programs"; - downloadPage = "https://github.com/reasonml/reason-native"; - homepage = "https://reason-native.com/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - } // (prepkg.meta or {}); - } // prepkg) - ); - cli = generic ./cli.nix; # Used only by Rely. -in - lib.makeScope newScope (self: with self; { - console = generic ./console.nix; - dir = generic ./dir.nix; - file-context-printer = generic ./file-context-printer.nix; - fp = generic ./fp.nix; - pastel = generic ./pastel.nix; - pastel-console = generic ./pastel-console.nix; - qcheck-rely = generic ./qcheck-rely.nix; - refmterr = generic ./refmterr.nix; - rely = generic ./rely.nix; - rely-junit-reporter = generic ./rely-junit-reporter.nix; - }) +lib.makeScope newScope (self: { + inherit lib buildDunePackage re reason ppxlib; + + # Upstream doesn't use tags, releases, or branches. + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; + hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + }; + + cli = self.callPackage ./cli.nix { }; + console = self.callPackage ./console.nix { }; + dir = self.callPackage ./dir.nix { }; + file-context-printer = self.callPackage ./file-context-printer.nix { }; + frame = self.callPackage ./frame.nix { }; + fp = self.callPackage ./fp.nix { }; + fs = self.callPackage ./fs.nix { }; + pastel = self.callPackage ./pastel.nix { }; + pastel-console = self.callPackage ./pastel-console.nix { }; + qcheck-rely = self.callPackage ./qcheck-rely.nix { + inherit qcheck-core; + }; + refmterr = self.callPackage ./refmterr.nix { + inherit atdgen; + }; + rely = self.callPackage ./rely.nix { }; + rely-junit-reporter = self.callPackage ./rely-junit-reporter.nix { + inherit atdgen junit; + }; + unicode-config = self.callPackage ./unicode-config.nix { }; + unicode = self.callPackage ./unicode.nix { }; + utf8 = self.callPackage ./utf8.nix { }; +}) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix index 8b09eafc36..6cd04ece01 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -1,7 +1,10 @@ -{ reason, fp, ... }: +{ lib, buildDunePackage, reason, fp, src }: + +buildDunePackage { + inherit src; -{ pname = "dir"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -14,5 +17,7 @@ meta = { description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index a7c663493e..462b667921 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -1,7 +1,10 @@ -{ reason, re, pastel, ... }: +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "file-context-printer"; + version = "0.0.3-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Utility for displaying snippets of files on the command line"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; homepage = "https://reason-native.com/docs/file-context-printer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix index 7df1c84e55..35a099771d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -1,7 +1,10 @@ -{ reason, ... }: +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; -{ pname = "fp"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -10,5 +13,7 @@ meta = { description = "Library for creating and operating on file paths consistently on multiple platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix new file mode 100644 index 0000000000..dc845db552 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; + + pname = "frame"; + version = "0.0.1-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + pastel + re + ]; + + meta = { + description = "Reason Native text layout library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix new file mode 100644 index 0000000000..c553f6a6ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fp, reason, src }: + +buildDunePackage { + inherit src; + + pname = "fs"; + version = "0.0.2-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "Reason Native file system API"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index 968b9f88af..1a424fad54 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -1,7 +1,10 @@ -{ reason, console, pastel, ... }: +{ lib, buildDunePackage, reason, console, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel-console"; + version = "0.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Small library for pretty coloring to Console output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; homepage = "https://reason-native.com/docs/pastel/console"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix index 6d08243638..d8a4d7e0f9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -1,13 +1,17 @@ -{ reason, re, ... }: +{ lib, buildDunePackage, reason, re, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel"; + version = "0.3.0-unstable-2024-05-07"; minimalOCamlVersion = "4.05"; nativeBuildInputs = [ reason ]; + propagatedBuildInputs = [ re ]; @@ -16,5 +20,7 @@ description = "Text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; homepage = "https://reason-native.com/docs/pastel/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index ac645791f4..4006df5d90 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -1,23 +1,15 @@ -{ qcheck-core, reason, console, rely, fetchpatch, ... }: +{ lib, buildDunePackage, qcheck-core, reason, console, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "qcheck-rely"; + version = "1.0.2-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; - patches = [ - (fetchpatch { - url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch"; - hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4="; - includes = [ - "src/qcheck-rely/QCheckRely.re" - "src/qcheck-rely/QCheckRely.rei" - ]; - }) - ]; - propagatedBuildInputs = [ qcheck-core console @@ -27,5 +19,7 @@ meta = { description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 17c595d9e1..3f320fd236 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -1,7 +1,10 @@ -{ atdgen, re, reason, pastel, ... }: +{ lib, buildDunePackage, atdgen, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "refmterr"; + version = "3.3.0-unstable-2024-05-07"; nativeBuildInputs = [ atdgen @@ -18,5 +21,7 @@ description = "Error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; homepage = "https://reason-native.com/docs/refmterr/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 25d9cc2c5f..46097c45eb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -1,7 +1,10 @@ -{ atdgen, junit, re, reason, pastel, rely, ... }: +{ lib, buildDunePackage, atdgen, junit, re, reason, pastel, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "rely-junit-reporter"; + version = "1.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -22,5 +25,7 @@ description = "Tool providing JUnit Reporter for Rely Testing Framework"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix index 40315a668b..e3ca4b9ad5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -1,7 +1,10 @@ -{ re, reason, cli, file-context-printer, pastel, ... }: +{ lib, buildDunePackage, re, reason, cli, file-context-printer, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "rely"; + version = "4.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -18,5 +21,7 @@ description = "Jest-inspired testing framework for native OCaml/Reason"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam similarity index 100% rename from third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam rename to third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re similarity index 100% rename from third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re rename to third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix index fc7f189133..b2bc31565f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -1,20 +1,34 @@ -{ lib, buildDunePackage, reason, console }: +{ lib, buildDunePackage, reason, console, ppxlib }: -buildDunePackage rec { - pname = "console-test"; +buildDunePackage { + pname = "console_test"; version = "1"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./console_test.opam + ./console_test.re + ./dune + ./dune-project + ]; + }; duneVersion = "3"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ reason console + ppxlib ]; doInstallCheck = true; + postInstallCheck = '' - $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + $out/bin/console_test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null ''; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune index 49f2121385..3bf2eefb27 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -1,4 +1,4 @@ (executable - (name console-test) - (public_name console-test) + (name console_test) + (public_name console_test) (libraries reason console.lib)) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project new file mode 100644 index 0000000000..a26d6e2739 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project @@ -0,0 +1 @@ +(lang dune 1.6) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix new file mode 100644 index 0000000000..1b80ae2a71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode-config"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Configuration used to generate the @reason-native/unicode library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix new file mode 100644 index 0000000000..544367424d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Easy to use and well documented Unicode symbols"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix new file mode 100644 index 0000000000..40c874b5b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "utf8"; + version = "0.1.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Utf8 logic with minimal dependencies"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix index ec5c86036a..ddf8ca5f6d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-v9wzvvMUG7qaj6ZqiFtUsp9r+rRQBAiE3Yz3zex4RRk="; + hash = "sha256-zTwdlPaViZoCbf9yaWmJvbENwWMpNLucvm9FmNSvptQ="; }; propagatedBuildInputs = [ seq ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index 5dbaefc3db..f7b9d512a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.6.3"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -22,21 +22,18 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-V8SsWsGYmUhR9/yV6BZBK1UjYGHlDrXrF8nt0eZbTnI="; + hash = "sha256-n55G6ulKcgSSrgPk70D52OO9fp3WURlcRhJQUKrZ1Nk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov" "" \ - --replace '"0.0.0"' '"${version}"' - - substituteInPlace tests/test_adguardhome.py \ - --replace 0.0.0 ${version} + --replace-fail "--cov" "" \ + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 22aef7748c..cdab42852c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.107"; + version = "9.2.108"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-yEwSHmAxbbdLVFatG4pKJokatCkO4RCZUMVAoBSOwTI="; + hash = "sha256-0Dzp6ws5/mrlQbtq3PqkX5K8DdJIkCejhfnY3pGLdtc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix index 4566a36e85..16989e9893 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiodhcpwatcher"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiodhcpwatcher"; rev = "v${version}"; - hash = "sha256-0of+no92s9SEKG1tc9lFlWR8f5Jnf3C723goQViB6+A="; + hash = "sha256-KZL5DejzDmizvvMUNfkFltl1xXz+2jX/3DVj60x6xOk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index e100d822d5..5d02fe4263 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-GIfujywp+yYRQ4xm6O5GgTCMn6I3TSYE5epaqhMGGnE="; + hash = "sha256-lqZnebFmNNSAOv3XcWHl+gtoWO7z27Zk0O6AJ7w+HDk="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix index 4d7c46ee54..a518d2431c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiohttp-isal"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiohttp-isal"; - rev = "v${version}"; - hash = "sha256-rSXV5Z5JdznQGtRI83UIbaSfbIYkUHphJTVK/LM2V4U="; + rev = "refs/tags/v${version}"; + hash = "sha256-sAtAzqMJoKryhB8q/TxqgFE+Z4Uxxw0hghk/Y2VNvx0="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-middlewares/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-middlewares/default.nix new file mode 100644 index 0000000000..e4fcfd671c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-middlewares/default.nix @@ -0,0 +1,54 @@ +{ + lib, + aiohttp, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + yarl, +}: + +buildPythonPackage rec { + pname = "aiohttp-middlewares"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "playpauseandstop"; + repo = "aiohttp-middlewares"; + rev = "refs/tags/v${version}"; + hash = "sha256-/xij16JUtq5T5KYinduEP+o4XxFQPyL7pfwvZnS96+U="; + }; + + postPatch = '' + sed -i "/addopts/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + async-timeout + yarl + ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiohttp_middlewares" ]; + + meta = with lib; { + description = "Collection of useful middlewares for aiohttp.web applications"; + homepage = "https://github.com/playpauseandstop/aiohttp-middlewares"; + changelog = "https://github.com/playpauseandstop/aiohttp-middlewares/blob/${version}/CHANGELOG.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix index 4d0a45414b..73ab81fa78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiohttp-zlib-ng"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohttp-zlib-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-XA2XSX9KA/oBzOLJrhj78uoy6ufLbVTENYZL3y/+fwU="; + hash = "sha256-SiDDtadbBnw67lnqadAVSkHILB/8Sur0MfjgCbndX4o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomealie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomealie/default.nix index 046ed8c04e..0f4488317b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomealie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomealie/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-I1CA/YD2pNvBijSQgF/R8v5DfR/xyh0t/HGGiVE5UbY="; + hash = "sha256-pchGl3bkbW2bOQenYoSb0NmDvJqsYYuHHd4oUA9aTFo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionut/default.nix index 8c9b8038ce..cfcefeb330 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aionut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionut/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aionut"; - version = "4.3.2"; + version = "4.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aionut"; rev = "refs/tags/v${version}"; - hash = "sha256-QehVC/6RbWp8KnOuVtLFkK8/STTgHXkXmFbSmzu9z7w="; + hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix index b6fc08e3c9..31e9ff403b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix @@ -4,46 +4,48 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytestCheckHook, pythonOlder, xmltodict, }: buildPythonPackage rec { pname = "aiosteamist"; - version = "0.3.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; - rev = version; - hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM="; + repo = "aiosteamist"; + rev = "refs/tags/v${version}"; + hash = "sha256-vqCcQDUMFFhIOoiER5TMOxJPY7HYFS4K1fuu/1IqP44="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=aiosteamist" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp xmltodict ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=aiosteamist" "" \ - --replace 'xmltodict = "^0.12.0"' 'xmltodict = "*"' - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aiosteamist" ]; - # Modules doesn't have test suite - doCheck = false; - meta = with lib; { description = "Module to control Steamist steam systems"; homepage = "https://github.com/bdraco/aiosteamist"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/bdraco/aiosteamist/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix index 5344131279..fc5b91f13a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-sy7/nCthmfI0WdBkwBU83fifcYTe9zUBOpxV7RX9F6w="; + hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix index 2e3ee99d5a..2d3c94b0f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; rev = "refs/tags/v${version}"; - hash = "sha256-VUznW+rMCZF1LbrQmEaOgdcX3YCm6Tf7yWlB8KNrjxU="; + hash = "sha256-pjHm+oCwbiD2dtkl30yATIVP85R72xEk/cmA+a5b05c="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix index fe46582dbf..92e8c7f7a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-Crc+OpkkRKHgrszXNuV2Q83IusOXt9y4IVTSz/w7l/Y="; + hash = "sha256-UKAfEBMybi9536QIDARATZYAs2CHQzFBIVorzwsnrQo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix index 1bb817406a..ad4db4e062 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pW8FoMdA8XdQZmLRwk5SBBgFhYhgEMJPA9+b+8aicuE="; + hash = "sha256-btBeYP+/ntWpWm5O6ERkRJlhpV8tLe9lrFLYOEB55cY="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix index f474e23457..a848a97158 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "airtouch5py"; - version = "0.2.8"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danzel"; repo = "airtouch5py"; rev = "refs/tags/${version}"; - hash = "sha256-MpwppyAWDiA3CZXCIUQ/vidzcxKXZJSlrFRhmrPMgCE="; + hash = "sha256-8QMyp/Y60V64k1V8Hze5FsgpfHr8ZT1Xj/kQDP7CtjI="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix index bf38fbd56b..0934747945 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amiibo-py/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "API Wrapper for amiiboapi.com"; homepage = "https://github.com/XiehCanCode/amiibo.py"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 9f1ff6bf29..e62fb5ebc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.107"; + version = "9.2.108"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-f4RiLXEp4q3V2SiX6OSLHbAVCaZ5GLOvqm1qmBAYIZ8="; + hash = "sha256-6DjcxmqxDz2aLzYLi/Uz+FsrzeARpJtEMh/Loctyfv8="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix index fa0b707409..f443e7f585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-5BSkUg36k2gNfOrVNkeRwU/4SlfEua3ZU4KTZmKSq4Q="; + hash = "sha256-a0nc8tbbSIOxLyIcPK5prqEDdz/J0aKwmGG52iHb59U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index 03b41c11e2..d10f0b369f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.12"; + version = "0.9.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JYVbJJbcZUE1a20mygyflSUgO7fPKBf4S5O/4/U8+B4="; + hash = "sha256-xlVFW/UfghgusjxZR9N8xB8LH/rK9+K3YxR6IzLLPwc="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix index 9c4021bbad..b199051111 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "This project extends the Application Insights API surface to support Python"; homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index f5331820f7..8842ab7201 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.107"; + version = "9.2.108"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-D29ddBceo4Bz3KUiQckdbV0e9uPXEOAAIHZrSpqw3BE="; + hash = "sha256-KMpTShw5aLQc1KMTuWVzhV7mV+Y9KnpNhVv153tggyM="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 4e286daa0e..c3abfb0c28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Low-level CFFI bindings for Argon2"; homepage = "https://github.com/hynek/argon2-cffi-bindings"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index d44de866d3..71a8688ed4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.3"; + version = "3.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-OLb4+7FFeVDW0ePyVJW8aaosouxlU/4Uq2ktvVLpDFY="; + hash = "sha256-5xbz56/s448PIOZ4DN6NFcYYWXaebaZA3ApGAIMZXH4="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix index 1bd70e81d3..77df68b23c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.16.2"; + version = "0.16.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "ValiMail"; repo = "authentication-headers"; rev = "refs/tags/${version}"; - hash = "sha256-/vxUUSWwysYQzcy2AmkF4f8R59FHRnBfFlPRpfM9e5o="; + hash = "sha256-BFMZpSJ4qCEL42xTiM/D5dkatxohiCrOWAkNZHFUhac="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ authres dnspython dkimpy @@ -46,10 +46,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the generation of email authentication headers"; - mainProgram = "dmarc-policy-find"; homepage = "https://github.com/ValiMail/authentication-headers"; changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "dmarc-policy-find"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 9b4a45c2f4..611454296c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "34"; + version = "35"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OayBTXafOK3ppfbDm4Wwe7wFr1Y0L7FXQu3OEjf54Ek="; + hash = "sha256-H4sRKll70kOHlOGnIaY6phhp+pWYoXrGvYEa1vZADQY="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index f7f613148f..1bd2e69742 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-HDO626bK5BH/mdLuGkeYIOz8X2N9/rkTLhQNzG1erYA="; + hash = "sha256-5Jg+Ki1vJ4Rz22TbqTvVtb5YLvkvP8EOQ7cmTmI6gQU="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix index 7beb170dd2..7fb7cda0d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 0de7d344b1..3718ee9ae7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -99,6 +99,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix index 3b59339946..71e97c27e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-cosmos_${version}/sdk/cosmos/azure-cosmos/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix index c9b61bcb57..7e030a049f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-data-tables_${version}/sdk/tables/azure-data-tables/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix index e7e4cf570c..1b1683d5bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Integrate Azure Functions with Azure DevOps. Specifically made for the Azure CLI"; homepage = "https://github.com/Azure/azure-functions-devops-build"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix index e059b2fb6e..83ac87a09e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 77bfa1ea25..61d295e1b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 79b13b55ea..2cf1f5a023 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 795ac2e897..b9766e0a93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix index e8959dd5f6..895ba9f289 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Key Vault Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix index 78879294d9..8ec0749410 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -33,7 +33,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ maxwilson - jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index d18dc5b59f..81d30a68fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/apimanagement/azure-mgmt-apimanagement"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-apimanagement_${version}/sdk/apimanagement/azure-mgmt-apimanagement/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index a662f9ec33..4415da9527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 053211a5ac..fb20a44246 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index db019c5771..f29c1c1ad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/botservice/azure-mgmt-botservice"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-botservice_${version}/sdk/botservice/azure-mgmt-botservice"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index c8a189bb8c..8668ecb99d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ maxwilson - jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 9604f102ec..98f652cf1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index ef3aedee0d..5dc2f51e7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 11878a1a63..2d486d0156 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databox/azure-mgmt-databox"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-databoxedge_${version}/sdk/databox/azure-mgmt-databox/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index b790482ee7..2d08ad2f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -36,7 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f15bcca451..40f0d07e00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix index 5a5ef4d56d..de759e933b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/deploymentmanager/azure-mgmt-deploymentmanager"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-deploymentmanager_${version}/sdk/deploymentmanager/azure-mgmt-deploymentmanager/setup.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 5771730263..dab22d1e06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix index f1031a1db4..3c117d02f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index 5a97855848..ba9c4cacb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/extendedlocation/azure-mgmt-extendedlocation"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-extendedlocation_${version}/sdk/extendedlocation/azure-mgmt-extendedlocation"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index a20af6e013..4a80dc7e36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 2f254d6f24..ade13d07d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-imagebuilder"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 36ee7883f1..43f1de3c11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 7bd05198e4..f0b12aed9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 0cb59d7422..186258f84a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-kusto_${version}/sdk/kusto/azure-mgmt-kusto/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index a9334dd30d..aa2f41d6f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managedservices/azure-mgmt-managedservices"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 1fe67e9671..8a10fd41f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 9df7aa588c..8e05902380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ olcai maxwilson - jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index a1446f9542..20bed84580 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Microsoft Azure DNS Private Zones Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index de5fa0d7fa..6c678d4cad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 37e29ac970..ffb31fbfbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -41,7 +41,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ olcai maxwilson - jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix index e6e3475134..ea1eeecdef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix index 4152514643..8ed3ef2a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index 9e5405336b..e38d0f6cc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Microsoft Azure Servicelinker Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index 723e389a99..34a562f4e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/sql/azure-mgmt-sqlvirtualmachine"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-sqlvirtualmachine_${version}/sdk/sql/azure-mgmt-sqlvirtualmachine/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 4cc72e61d4..1857c3cc61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-storage_${version}/sdk/storage/azure-mgmt-storage/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ - jonringer olcai maxwilson ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index d9bf2b13a5..dbf4388710 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-mgmt-synapse"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-synapse_${version}/sdk/synapse/azure-mgmt-synapse/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index d03aaf12f9..7308578dfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Microsoft Azure Storage Client Library for Python with multi API version support"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index 55fd07d99e..a3b59c446c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-accesscontrol"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-accesscontrol_${version}/sdk/synapse/azure-synapse-accesscontrol/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 0cc9e72a98..45150bfc85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix index 0ad839d459..829577e636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-managedprivateendpoints"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-synapse-managedprivateendpoints_${version}/sdk/synapse/azure-synapse-managedprivateendpoints"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix index 51e07290ef..fbb9233538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-spark"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-spark_${version}/sdk/synapse/azure-synapse-spark/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix index a27197dea8..5c525685d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "Backport of the standard library module zoneinfo"; homepage = "https://github.com/pganssle/zoneinfo"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-cli/default.nix index 5573d7618a..61d95d8812 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.1.3"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-vYBbaUVJAs+aIp6aQpJb62DEDxe/sQTzgOkjPq6ADoc="; + hash = "sha256-ZN384KN6+pkDDsCk825sr+LsArQ5Vaf09ASLN8IemhM="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-extract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-extract/default.nix index 31ca5b48bc..b44a2e631c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-extract/default.nix @@ -4,13 +4,15 @@ buildPythonPackage, pythonOlder, pytestCheckHook, + iso8601, poetry-core, + pytest-lazy-fixture, pytz, }: buildPythonPackage rec { pname = "beanhub-extract"; - version = "0.0.7"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,14 +21,20 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-extract"; rev = "refs/tags/${version}"; - hash = "sha256-Wt8ZCyCaERNXEd0/Q89QWUW/wGFSHAP2RZLhnv5xkgY="; + hash = "sha256-Uw9bSVOpiIALkgA77OrqAcDWcEafVSnp4iILa4Jkykc="; }; build-system = [ poetry-core ]; - dependencies = [ pytz ]; + dependencies = [ + iso8601 + pytz + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; pythonImportsCheck = [ "beanhub_extract" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix index 4d205ebb54..230238b12d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "0.1.5"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; rev = "refs/tags/${version}"; - hash = "sha256-BH+d7cKC83b7T2Z1Xlwpsv3KACo1vDn6v65tElhir/c="; + hash = "sha256-jDZUsV5yj4h7zUA5NB/4exhPj3f3put/bKXZmPz94OQ="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 3671757c3f..6e95bec307 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/bids-validator"; changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 0f3d10d2b3..d3ebcbe91e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -19,6 +19,7 @@ nose, pycrypto, pyqtgraph, + pyqt5, visualizationSupport ? false, }: @@ -61,6 +62,7 @@ buildPythonPackage rec { ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph + pyqt5 ] ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index 0e70546832..8bec331498 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.131"; + version = "1.34.136"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-AZ2CqKRJbAGGPWdqjU8q2DC/TLdSsRB+pFP+4w1QOmA="; + hash = "sha256-7Lzngq4ZA30fJmc8/DA1hJPJZY6grwbdWKmZvpY6snU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index 0eac91a8f3..34432cd960 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.131"; + version = "1.34.136"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-pS4FLPCKxwjCjh8wKtAxzXYELm+JUTcta+E1CKlYQwY="; + hash = "sha256-uXvs5Eq8nxbB/LAi0/A8ItQR6j3LRzAgejGOuObvY+c="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 28843f9887..440ac99954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.36.2"; + version = "1.36.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-RQYMQ1Zt+MJ3PyVGSTGo/Qi95M+NVGn7oC2gqXJdlEU="; + hash = "sha256-JTAd7Nkreyfczomki05WHuuJCFWspvG8i6DAWaQI6fs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix index b7f49ccce5..fc34238f00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, nose , numpy , scipy , statsmodels @@ -24,6 +25,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + nose # not actually required during runtime, but specified as required in `setup.py` numpy scipy statsmodels diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 542de4e844..09ecb4f986 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Utilities for interfacing with Plotly's Chart Studio service"; homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index 45e66edcdc..aa1575e2f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.5.3"; + version = "10.5.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-BhUTOzBa+dEBxtqXDTKuCpsZw8fqwl9Kait5NOcn29g="; + hash = "sha256-iwL77pt313rroaJw7Pn6n41aSzLyKLiUR32yai91jWE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 3cc8b05aad..6b9108aea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.107"; + version = "9.2.108"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-89wh/SuwxOuORk3S42VA/cJh1GACFWB4ceUxp2OszQM="; + hash = "sha256-CTCgiwt/vMJugo1KS5zugbfwk/a3TeMX/ezk9wkMsoo="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index f828e4c4b2..ac93d8c9fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -19,14 +19,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.107"; + version = "9.2.108"; # 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-7b3kjPoaJ9z1wdz125XsD0hj5FXj9DmUt8Hpqd/AjKs="; + hash = "sha256-d3Hs3k7PmOZqvLoiHD9HctaEHHOafCefjUcKGBPIiHU="; }; in buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-0dfnp0sIxO4Ln20c57Wb9B0E987v+xhrX53yriC+Qy0="; + hash = "sha256-3zzTH6WKAavB/lkLBastOdeKegO8IyKRGN7k2vnX5WA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix index b7c2070ebc..e5f227f754 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix @@ -1,14 +1,19 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies numpy, scikit-learn, termcolor, tqdm, pandas, - setuptools, + # test dependencies datasets, fasttext, @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +40,7 @@ buildPythonPackage rec { owner = "cleanlab"; repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-wehvGh27Ey1YK+eWTjT6jRwa7yqPpx3P0HUNePoljpw="; + hash = "sha256-08ePFTCRuggr4hTCfr/gbzMhLozz4KCywhPFSKYDNng="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix index 56ecdd6835..1ba1c24413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.7.1"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-JnSWKQFPrD8wadgz/4Ulisy6Mjc264JHX3PMOX+msac="; + hash = "sha256-g16BqbL2WOsMO7PlzTfVR8Ftf32VR8QtvBw1ZNTIOZQ="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix index e5e4a13420..78577b34d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-ON2Fyyq5fa0TgS28v6FAbR6MpI1k8EOS8HWchfZyT+g="; + hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index de99d37cfb..9bf5bd2cab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, cryptography, @@ -79,7 +78,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_jobqueue" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix index 8d60496d6a..a7ba751c3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix @@ -11,7 +11,6 @@ grpcio, skein, pytestCheckHook, - stdenv, }: buildPythonPackage rec { @@ -84,6 +83,5 @@ buildPythonPackage rec { homepage = "https://yarn.dask.org/"; license = licenses.bsd3; maintainers = with maintainers; [ illustris ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix index 572fa905e8..bbbabdc083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -49,6 +48,5 @@ buildPythonPackage rec { changelog = "https://github.com/altdesktop/python-dbus-next/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix index 4cb4ea6f4c..b51ff53751 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Subprocesses for Humans 2.0"; homepage = "https://github.com/amitt001/delegator.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index a614a4feb9..6afee98488 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "4.0.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6FtxfY0vjCbCueeXdAXOy6XSjne4I7brQ5OvJ+Q1KsQ="; + hash = "sha256-Qv63aX96iUzxZPKr3FZq7fuWh2fYmKV3JMmy7txT05w="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index ff97717988..f34b0fc6be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://discordpy.rtfd.org/"; changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; license = licenses.mit; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix index 823207a087..d6a8a50d93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, poetry-core, pytest-asyncio, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "discovery30303"; - version = "0.2.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; - # Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1 - rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07"; - hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM="; + repo = "discovery30303"; + rev = "refs/tags/v${version}"; + hash = "sha256-P31P5GjIrMotdIXqqZ6LCbk5MIl2Kq4MzlWDw+aOcrE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=discovery30303" "" + ''; + nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ @@ -32,17 +36,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=discovery30303" "" - ''; - pythonImportsCheck = [ "discovery30303" ]; meta = with lib; { description = "Module to discover devices that respond on port 30303"; homepage = "https://github.com/bdraco/discovery30303"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/bdraco/discovery30303/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix index 7b0c771648..d30360e375 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "10.3"; + version = "11.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-5uSpPeXpMkpuzMXzsGE6uQJWP/Dt/oqakB8Xb5G1eZY="; + hash = "sha256-8XRDoJ9WPKBjgTgQgNmf0omDILfZtnGg3I5HT9rgNic="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix index fd4be9238a..1a15587567 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.8"; + version = "4.0.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-FejU0k2/fmR5QdAJy2xxx3MKgu89/pOj4cIWsMGUw0M="; + hash = "sha256-T7XnPxvqnLI3rd0xSZb2iOsgcOqiA/JrRh3rjCm5gG4="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 93d09f2cfc..c26f5f656d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "API client for docker written in Python"; homepage = "https://github.com/docker/docker-py"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix index 4a646d4502..5ee6990ff9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { homepage = "https://github.com/ShayHill/docx2python"; description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images"; changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index aa44378f6c..d42085999e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitLab, @@ -36,7 +35,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ducc0" ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc"; description = "Efficient algorithms for Fast Fourier transforms and more"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix index 5b13f55ebe..32c0d20b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix @@ -6,11 +6,9 @@ pythonOlder, duckdb, hypothesis, - ipython-sql, pandas, poetry-core, pytest-remotedata, - snapshottest, sqlalchemy, typing-extensions, }: @@ -40,19 +38,12 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; - disabledTests = [ - # test should be skipped based on sqlalchemy version but isn't and fails - "test_commit" - ]; - nativeCheckInputs = [ pytestCheckHook ]; checkInputs = [ hypothesis - ipython-sql pandas pytest-remotedata - snapshottest typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix index e6a18d59f2..d85b3ecf9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix @@ -13,12 +13,13 @@ buildPythonPackage rec { pname = "dvc-s3"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-0yD5FsinQat3cbmY5teClFS0KEGUvED2Ah/JCbTtZ/s="; + pname = "dvc_s3"; + inherit version; + hash = "sha256-HQEqwdzkdlmYb5GBI7SJMc+bNCmrC0oi/UsCRIGFzrY="; }; # Prevent circular dependency @@ -26,15 +27,19 @@ buildPythonPackage rec { # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs postPatch = '' - substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore' + substituteInPlace pyproject.toml \ + --replace-fail "aiobotocore[boto3]" "aiobotocore" ''; - nativeBuildInputs = [ + build-system = [ setuptools-scm + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ aiobotocore boto3 dvc-objects diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index e9144961c6..b30a370628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/elementpath"; changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix index 249cbf6d83..da51b198ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Null Object pattern for files"; homepage = "https://github.com/approvals/EmptyFiles.Python"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix index 2cc2522c0d..4d181fab70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enamlx/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, enaml, pyqtgraph, + pyqt5, pythonocc-core, typing-extensions, }: @@ -24,6 +25,7 @@ buildPythonPackage rec { enaml # Until https://github.com/inkcut/inkcut/issues/105 perhaps pyqtgraph + pyqt5 pythonocc-core typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix index a5ebbbf936..262691535d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix @@ -9,13 +9,14 @@ pytest-freezer, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "energyzero"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -23,16 +24,16 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-NZbCiLCZC+hTcV0twOeCoKKD3eZ0/ZzPTnVpFyMLSfw="; + hash = "sha256-KOeYdTruD8AN/NkLEKKJDUB/JkOoQwfAMZkp/RvvUQE="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" + --replace-fail '"0.0.0"' '"${version}"' \ + --replace-fail 'addopts = "--cov"' "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; propagatedBuildInputs = [ aiohttp @@ -44,6 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-freezer pytestCheckHook + syrupy ]; pythonImportsCheck = [ "energyzero" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index a8784aacb5..80c7f22cb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-ND1QObDdn6tBGNlnnVadNv6ibYYpOoo2HZEXIMlfwyc="; + hash = "sha256-GWNGLhnXr8NOrR5stOjHbk9X+BObs1sbG6lWn2apPQI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix index 5544151686..09c108747b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.19"; + version = "0.4.20"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-B7LvGXAZO1pd9iCuZjW/bRWdB5PEzfcQjZWokGzMN70="; + hash = "sha256-06ziExAcb9PZdtWjoksPIUiOuUZaSJnQi5CI0v6nla0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix new file mode 100644 index 0000000000..01869fb292 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/exiv2/default.nix @@ -0,0 +1,46 @@ +{ + lib, + pkg-config, + exiv2, + python3Packages, + fetchFromGitHub, + gitUpdater, +}: +python3Packages.buildPythonPackage rec { + pname = "exiv2"; + version = "0.16.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jim-easterbrook"; + repo = "python-exiv2"; + rev = "refs/tags/${version}"; + hash = "sha256-DX0pg80fOSkWqrIvcye0btZGglnizzM9ZEuVEpnEJKQ="; + }; + + build-system = with python3Packages; [ + setuptools + toml + ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ exiv2 ]; + + pythonImportsCheck = [ "exiv2" ]; + nativeCheckInputs = with python3Packages; [ unittestCheckHook ]; + unittestFlagsArray = [ + "-s" + "tests" + "-v" + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Low level Python interface to the Exiv2 C++ library"; + homepage = "https://github.com/jim-easterbrook/python-exiv2"; + changelog = "https://python-exiv2.readthedocs.io/en/release-${version}/misc/changelog.html"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ zebreus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 57eebb7d61..da813f7611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.47"; + version = "1.5.48"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-kQUVYOHMR6R2o5rROpwBeVW4lqKqkcYT3O9BRyKDNmE="; + hash = "sha256-wBw6b6/tjvoiQnOyyTkdNlGxHkB7XnIrzFxwenbn06k="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix index 1a70011159..6bfddc120c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace-fail "-flto" "" + ''; + nativeBuildInputs = [ pybind11 ]; # tests are removed from fork @@ -28,7 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/searxng/fasttext-predict/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix index 05750d9bae..d9c37657ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffcv/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, + pythonAtLeast, fetchFromGitHub, + setuptools, lib, libjpeg, numba, @@ -10,12 +12,20 @@ pytorch-pfn-extras, terminaltables, tqdm, + pytestCheckHook, + assertpy, + psutil, + torchvision, + webdataset, }: buildPythonPackage rec { pname = "ffcv"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + + # version 1.0.0 uses distutils which was removed in Python 3.12 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "libffcv"; @@ -27,15 +37,13 @@ buildPythonPackage rec { # See https://github.com/libffcv/ffcv/issues/159. postPatch = '' substituteInPlace setup.py \ - --replace "'assertpy'," "" \ - --replace "'fastargs'," "" \ - --replace "'imgcat'," "" \ - --replace "'matplotlib'," "" \ - --replace "'psutil'," "" \ - --replace "'sklearn'," "" \ - --replace "'webdataset'," "" + --replace-fail "'assertpy'," "" \ + --replace-fail "'fastargs'," "" \ + --replace-fail "'opencv-python'," "" \ + --replace-fail "'psutil'," "" \ ''; + build-system = [ setuptools ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg ]; propagatedBuildInputs = [ @@ -47,16 +55,58 @@ buildPythonPackage rec { tqdm ]; - # `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some - # reason. See https://github.com/NixOS/nixpkgs/pull/160441#issuecomment-1045204722. - doCheck = false; - pythonImportsCheck = [ "ffcv" ]; - meta = with lib; { + # C/C++ python modules are only in the installed output and not in the build + # directory. Since tests are run from the build directory python prefers to + # import the local module first which does not contain the C/C++ python + # modules and results in an import error. By changing the directory to + # 'tests' the build directory is no long available and python will import + # from the installed output in the nix store which does contain the C/C++ + # python modules. + preCheck = '' + cd tests + ''; + + nativeCheckInputs = [ + assertpy + psutil + pytestCheckHook + torchvision + webdataset + ]; + + disabledTestPaths = [ + # Tests require network access and do not work in the sandbox + "test_augmentations.py" + # Occasionally causes the testing phase to hang + "test_basic_pipeline.py" + ]; + + disabledTests = [ + # Tests require network access and do not work in the sandbox + "test_cifar_subset" + # Requires CUDA which is unfree and unfree packages are not built by Hydra + "test_cuda" + "test_gpu_normalization" + # torch.multiprocessing.spawn.ProcessRaisedException + "test_traversal_sequential_2" + "test_traversal_sequential_3" + "test_traversal_sequential_4" + "test_traversal_random_2" + "test_traversal_random_3" + "test_traversal_random_4" + "test_traversal_sequential_distributed_with_indices" + "test_traversal_random_distributed_with_indices" + ]; + + meta = { description = "FFCV: Fast Forward Computer Vision"; homepage = "https://ffcv.io"; - license = licenses.asl20; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + samuela + djacu + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index 7c443368bd..955177b9bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -1,32 +1,40 @@ { lib, buildPythonPackage, - cloudpickle, - einops, + pythonOlder, fetchFromGitHub, - jax, + + # build-system jaxlib, - keras, - matplotlib, + pythonRelaxDepsHook, + setuptools-scm, + + # dependencies + jax, msgpack, numpy, optax, orbax-checkpoint, - pytest-xdist, - pytestCheckHook, - pythonOlder, - pythonRelaxDepsHook, pyyaml, rich, - setuptools-scm, - tensorflow, tensorstore, typing-extensions, + + # checks + cloudpickle, + einops, + keras, + pytest-xdist, + pytestCheckHook, + tensorflow, + + # optional-dependencies + matplotlib, }: buildPythonPackage rec { pname = "flax"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +43,7 @@ buildPythonPackage rec { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-ZwqKZdJ9LOfWTav5nE9xMsMw/DbryqQUuu5fqeugBzY="; + hash = "sha256-6WOFq0758gtNdrlWqSQBlKmWVIGe5e4PAaGrvHoGjr0="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexcache/default.nix new file mode 100644 index 0000000000..1442940ca1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexcache/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + typing-extensions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flexcache"; + version = "0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hgrecco"; + repo = "flexcache"; + rev = "refs/tags/${version}"; + hash = "sha256-MAbTe7NxzfRPzo/Wnb5SnPJvJWf6zVeYsaw/g9OJYSE="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flexcache" ]; + + meta = { + description = "An robust and extensible package to cache on disk the result of expensive calculations"; + homepage = "https://github.com/hgrecco/flexcache"; + changelog = "https://github.com/hgrecco/flexcache/blob/${src.rev}/CHANGES"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexparser/default.nix new file mode 100644 index 0000000000..b0ec855ed2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexparser/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + typing-extensions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flexparser"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hgrecco"; + repo = "flexparser"; + rev = "refs/tags/${version}"; + hash = "sha256-9ImG8uh1SZ+pAbqzWBkTVn+3EBAGzzdP8vqqP59IgIw="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flexparser" ]; + + meta = { + description = "Parsing made fun ... using typing"; + homepage = "https://github.com/hgrecco/flexparser"; + changelog = "https://github.com/hgrecco/flexparser/blob/${src.rev}/CHANGES"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix new file mode 100644 index 0000000000..7535ba80d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix @@ -0,0 +1,23 @@ +{ lib, pkg-config, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "freertos-gdb"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; + }; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "User-friendly view of FreeRTOS kernel objects in GDB"; + homepage = "https://github.com/espressif/freertos-gdb"; + license = licenses.asl20; + maintainers = with maintainers; [ + danc86 + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix index 89140e97a4..7bf6d5a6d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.19"; + version = "0.18.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs="; + hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix index 331785dd9e..a11a9d0fab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-vgOsFEocgBvYba9Aq4HDYsnK1w+iQm1QDTzln68Tqss="; + hash = "sha256-GHvLE6xTY37MCDlGOmvyqi42ORRk1W8UcQXqH3Ty/c4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 35de32bea6..7062b2b2e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.24.0"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6V5vbgqjLmxFPUTisymJMf3XlHwwnqMpoxtv8fk54X4="; + hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index f3cafa489d..fb5e089228 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.21.0"; + version = "2.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8="; + hash = "sha256-SUaW4XiMVe9bL61GSBP92fWRF/wogZt9nSehhz17f60="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 8ba2f84e07..4f4877e358 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.4"; + version = "2.21.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LLjHaYrb/qBEjbbIm3iqchf84HweN7RtPlNfoWM/OuY="; + hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix index 13f9386eb1..21730414ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-cK5Go5mFy+dC5/B4aMLDjZytNZn79r+ZvOEwAW0FPrI="; + hash = "sha256-4pfcZIRPxkZkKjzYtOn3r7mn0pJZeUzkYidZmePgDys="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix index 07e60b09b5..c9a97a114c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.31.2"; + version = "0.31.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-aWSf80WmVopkvqCzQKHEw9McrfepZcN+fhrUP90gf5U="; + hash = "sha256-Gb9k2MieRKSJeKpmltL9HYA7pYKTSTWLGDgo52mY6xA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix index fee6555d37..f6eabfe721 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.0"; + version = "1.5.1"; 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-L9c/58B50E5Kk44j9tvtDZ0+ncJZ4KubTz/U9FI71+E="; + hash = "sha256-pmExXQmkkjeMHegXV/b94a95qkoOHA7SJOkR1NUV4lE="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix index 126a259a95..7cdb0a533b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix @@ -34,12 +34,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.70"; + version = "2.71"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-hohGgOnxP1nb8NfkDRYPJ08sx0EH8PxX7Rblk1PLlIk="; + hash = "sha256-MVeEEAxvc6fEmQatlTn9XGCOTNkcCv8ouNbYqL69A8U="; }; # Remove error messages about tput during build process without adding ncurses, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 806dd8681c..0d27b5bf71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.4.1"; + version = "1.4.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-M4oxFi/PpqhJgZX/wM+9rSrraIZcqzubbxnihfK0W2E="; + hash = "sha256-yoCbFLtyPEtELp2ptpBBdJTE7yyMqUeMRWT3wfKk5JM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 3f4a0c2850..4ff230e62c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.3"; + version = "11.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WUPOok/tpZJSookzCIEHRKAlTzeZ6RJY0IiclgQUOs8="; + hash = "sha256-Yph2g254fSnPVfgmkmeRSqlmsUfHgP+wqN0GHLIV/wc="; }; nativeCheckInputs = [ mercurial ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix index 5b538536c9..05d2214f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { mock ]; - pythonImportChecks = [ "hikari" ]; + pythonImportsCheck = [ "hikari" ]; disabled = pythonOlder "3.7"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix index 229e8e72b4..9c05025ddf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.27"; + version = "0.0.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-3iIQNtdd8sBGfNJrugjjWv4PQKhdFH+prw4poevh+O0="; + hash = "sha256-3RUbHVbnfC0L9u6/VMKK2BhTuc2y5kD83Cn8dQ24kQQ="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix index 7e60ddaf0b..6067efde3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index e2c83a079d..929ca2abef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.34.1"; + version = "2.34.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-/VZUifiz8iImq+JLvckFDr7YMIqu0Xro2t3GFj0obg0="; + hash = "sha256-1q/LPEdo9rzcIR1ZD+bIP8MIKe7PmxRd8UX6c5C0V5k="; }; patches = lib.optionals (!stdenv.isDarwin) [ @@ -113,11 +113,11 @@ buildPythonPackage rec { "test_reverse_read" ]; - meta = with lib; { + meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "https://imageio.readthedocs.io"; changelog = "https://github.com/imageio/imageio/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ Luflosi ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 0c959277f3..7fe84b567d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.43.0"; + version = "1.44.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-CwSqJj9MslcvTzYGaDRygskSxbSh80uCJQM2tNz743k="; + hash = "sha256-iG9edGHqhExUoL+1q8s5QvY/mrYOMosgtA2P1zwO3o8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb3-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb3-python/default.nix index 86a774e916..2aa2705a88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vumKOvCLpcu0z1W/zmf3qsSo3a8FEbI+20/IMt6nCX4="; + hash = "sha256-xu1uWVhZCFIjyOjE144X0JFtYY/nIoBHp/eHtysARYc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix index c8c59c79b9..ada4397a03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "brain-dead simple parsing of ini files"; homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix index f5b6730ef3..7ce90c23f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/injector/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python dependency injection framework, inspired by Guice"; homepage = "https://github.com/alecthomas/injector"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix index bdd094983e..5dc9382baa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/MSeifert04/iteration_utilities"; changelog = "https://github.com/MSeifert04/iteration_utilities/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix index 52627e5641..2c26ec97ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index b77a7de7b3..99fa4c8684 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -374,13 +374,20 @@ let sha256 = ( if cudaSupport then - { x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; } + { x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; } else { - x86_64-linux = "sha256-R1TIIyyyLlDqAlUkuhJhtyTxZMra2q5S/jX0OCInsEQ="; - aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY="; + x86_64-linux = "sha256-NzJJg6NlrPGMiR8Fn8u4+fu0m+AulfmN5Xqk63Um6sw="; + aarch64-linux = "sha256-Ro3qzrUxSR+3TH6ROoJTq+dLSufrDN/9oEo2MRkx7wM="; } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); + + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { @@ -418,7 +425,7 @@ let throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { - inherit meta pname version; + inherit pname version; format = "wheel"; src = @@ -471,4 +478,11 @@ buildPythonPackage { # Without it there are complaints about libcudart.so.11.0 not being found # because RPATH path entries added above are stripped. dontPatchELF = cudaSupport; + + passthru = { + # Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps` + inherit bazel-build; + }; + + inherit meta; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix index ef9afff973..2f0dcad69c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Jinja2 Ansible Filters"; homepage = "https://pypi.org/project/jinja2-ansible-filters/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix index de6d39dfbb..998b841e37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Generate source code for Python classes from a JSON schema"; homepage = "https://github.com/microsoft/jschema-to-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix index ec01c1beff..d7622853b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.30.0"; + version = "4.31.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-jeQOnJ8dLUbp60Nk5v4NYKVR8VYlGz08QHIfQotO2uY="; + hash = "sha256-wtiVUf7aA0++XKb2hVcXeyKneY4eq5M4FN1JbdxMh9Q="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index ec9dd06380..58e1763006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://github.com/jupyter-server/jupyter_server_mathjax"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix index beefbfeddb..53c03dbdac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Jupyterlab syntax coloring theme for pygments"; homepage = "https://github.com/jupyterlab/jupyterlab_pygments"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix index ea09f1c450..e57ec6de67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix index 08a7592b29..5bc543a929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kvanzuijlen"; repo = "justnimbus"; rev = "refs/tags/${version}"; - hash = "sha256-JO8T0JItkkNHxlnDKOO8kM9KSzT7QML4sszPymgXSBA="; + hash = "sha256-FsuvpmMWBYI1LheO3NFfCeaW4m3YQ41Tc81TP3gdNqo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix index 44d86fc29a..2622f3d3bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-7PLOuWxA5ziOuysSu+nLWNmNA3/sbuUCuZcMRBflf6U="; + hash = "sha256-9uDloaf9w75O+7r27PK/xOf0TrK43ndxnTUcm4CmOXo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index 4882b45aa4..315cae0e0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -3,7 +3,11 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies absl-py, dm-tree, h5py, @@ -12,13 +16,14 @@ namex, numpy, optree, + packaging, rich, tensorflow, }: buildPythonPackage rec { pname = "keras"; - version = "3.3.3"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +32,7 @@ buildPythonPackage rec { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-hhY28Ocv4zacZiwFflJtufKpeKfH1MD1PZJ+NTJfpH0="; + hash = "sha256-P/TRczWi/prv5D0/I6yLChIDfc6QdGcRSaF4Dd1Iowk="; }; build-system = [ @@ -43,6 +48,7 @@ buildPythonPackage rec { namex numpy optree + packaging rich tensorflow ]; @@ -58,6 +64,7 @@ buildPythonPackage rec { meta = { description = "Multi-backend implementation of the Keras API, with support for TensorFlow, JAX, and PyTorch"; homepage = "https://keras.io"; + changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ NikolaMandic ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix index 46005c96be..6953cd45b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/laspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/laspy/default.nix index 0e89f49d55..9e68b13137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/laspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/laspy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "laspy"; - version = "2.5.3"; + version = "2.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-StaYkUNY6loJbaUuabzszTINnd+zZ0gKXCteCG24Erc="; + hash = "sha256-7r2/M3mvvAsk5+SBL6xWe/+IDR6FH3AXXSI3Wq7N9+E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix index b02f4edb45..595e353c43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8DBA01QjW99OVYI9zC1Q+utnwzc10idUG7y+lmUbO4A="; + hash = "sha256-4z6SJE/VFNa81ecDal2IEX9adYBrSzco9VfhUPKBj4k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index f424240f91..9af39f33d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.0.0"; + version = "10.4.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; + hash = "sha256-Qwn07C8N2ZZzE5+qCo2HtBSm5/zGBqbiLnJePxuEJjs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index 2d9ff69847..504b5e616c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.2"; + version = "0.11.3.post0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-IT9aRAUNc2cP2erLr0MglZSVLfDjOxg8PVIIe9AvO0o="; + hash = "sha256-pOy8BCNwuPcM6cvUl295y+0QrcWOq2rT9iZMKyBxpqg="; }; build-system = [ setuptools ]; @@ -67,12 +67,12 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; - meta = with lib; { + meta = { changelog = "https://github.com/Lightning-AI/utilities/releases/tag/v${version}"; description = "Common Python utilities and GitHub Actions in Lightning Ecosystem"; homepage = "https://github.com/Lightning-AI/utilities"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 71b90f73f1..06d00b7747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/third_party/nixpkgs/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.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-K+k3tsELhF6TXVK/voMRYpb0vVkGQpkzYnB9syCLmoY="; + hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 893ea6338e..8beec615d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-O8V9b52gcsWm0bfHlNThIvxPox7d+qK4KzvPWT0fkGc="; + hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix index 7befaa996a..10cfa9c895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Lightweight Python client for LocalStack"; homepage = "https://github.com/localstack/localstack-python-client"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix index 5508507d20..2bf7bf447b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Extensions for LocalStack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix index 0f9e77e86d..d6b26ebe40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "Fully functional local Cloud stack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix index 44078adc50..98d1fae1d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/libxml-2.12.patch b/third_party/nixpkgs/pkgs/development/python-modules/lxml/libxml-2.12.patch deleted file mode 100644 index d0d211c9fe..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/libxml-2.12.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 3b8807306d79d2ae2e9fa28c5ecd3b40b32ee65b Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Wed, 29 Nov 2023 10:28:47 +0100 -Subject: [PATCH] Follow changes in libxml2 2.12 and make xmlError usages - 'const'. This mostly impacts the error callback functions. - ---- - src/lxml/extensions.pxi | 4 ++-- - src/lxml/parser.pxi | 4 ++-- - src/lxml/xmlerror.pxi | 8 ++++---- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/lxml/extensions.pxi b/src/lxml/extensions.pxi -index 35a321b7..42b4c4f6 100644 ---- a/src/lxml/extensions.pxi -+++ b/src/lxml/extensions.pxi -@@ -393,7 +393,7 @@ cdef tuple LIBXML2_XPATH_ERROR_MESSAGES = ( - b"?? Unknown error ??\n", - ) - --cdef void _forwardXPathError(void* c_ctxt, xmlerror.xmlError* c_error) with gil: -+cdef void _forwardXPathError(void* c_ctxt, const xmlerror.xmlError* c_error) with gil: - cdef xmlerror.xmlError error - cdef int xpath_code - if c_error.message is not NULL: -@@ -414,7 +414,7 @@ cdef void _forwardXPathError(void* c_ctxt, xmlerror.xmlError* c_error) with gil: - - (<_BaseContext>c_ctxt)._error_log._receive(&error) - --cdef void _receiveXPathError(void* c_context, xmlerror.xmlError* error) nogil: -+cdef void _receiveXPathError(void* c_context, const xmlerror.xmlError* error) nogil: - if not __DEBUG: - return - if c_context is NULL: -diff --git a/src/lxml/parser.pxi b/src/lxml/parser.pxi -index 22463c7d..1566b6df 100644 ---- a/src/lxml/parser.pxi -+++ b/src/lxml/parser.pxi -@@ -626,10 +626,10 @@ cdef _initParserContext(_ParserContext context, - if c_ctxt is not NULL: - context._initParserContext(c_ctxt) - --cdef void _forwardParserError(xmlparser.xmlParserCtxt* _parser_context, xmlerror.xmlError* error) with gil: -+cdef void _forwardParserError(xmlparser.xmlParserCtxt* _parser_context, const xmlerror.xmlError* error) with gil: - (<_ParserContext>_parser_context._private)._error_log._receive(error) - --cdef void _receiveParserError(void* c_context, xmlerror.xmlError* error) nogil: -+cdef void _receiveParserError(void* c_context, const xmlerror.xmlError* error) nogil: - if __DEBUG: - if c_context is NULL or (c_context)._private is NULL: - _forwardError(NULL, error) -diff --git a/src/lxml/xmlerror.pxi b/src/lxml/xmlerror.pxi -index 1b50444f..4cd745f9 100644 ---- a/src/lxml/xmlerror.pxi -+++ b/src/lxml/xmlerror.pxi -@@ -66,7 +66,7 @@ cdef class _LogEntry: - tree.xmlFree(self._c_path) - - @cython.final -- cdef _setError(self, xmlerror.xmlError* error): -+ cdef _setError(self, const xmlerror.xmlError* error): - self.domain = error.domain - self.type = error.code - self.level = error.level -@@ -198,7 +198,7 @@ cdef class _BaseErrorLog: - pass - - @cython.final -- cdef void _receive(self, xmlerror.xmlError* error): -+ cdef void _receive(self, const xmlerror.xmlError* error): - cdef bint is_error - cdef _LogEntry entry - cdef _BaseErrorLog global_log -@@ -634,7 +634,7 @@ def use_global_python_log(PyErrorLog log not None): - - - # local log functions: forward error to logger object --cdef void _forwardError(void* c_log_handler, xmlerror.xmlError* error) with gil: -+cdef void _forwardError(void* c_log_handler, const xmlerror.xmlError* error) with gil: - cdef _BaseErrorLog log_handler - if c_log_handler is not NULL: - log_handler = <_BaseErrorLog>c_log_handler -@@ -645,7 +645,7 @@ cdef void _forwardError(void* c_log_handler, xmlerror.xmlError* error) with gil: - log_handler._receive(error) - - --cdef void _receiveError(void* c_log_handler, xmlerror.xmlError* error) nogil: -+cdef void _receiveError(void* c_log_handler, const xmlerror.xmlError* error) nogil: - # no Python objects here, may be called without thread context ! - if __DEBUG: - _forwardError(c_log_handler, error) --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix index 220affe7be..9c1139880a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.19"; + version = "0.6.23"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PQrqOqWhQ4sz2kSX8A4NWhLJegAkCBE7Im+u11KkmB0="; + hash = "sha256-wnjd2U2f6ONiSehLpAhLK0VIUVcoxhFuyYWiQu/8YjY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 1b9bce9c41..163bc05167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.6.1"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-IHHYYtQrdSAtZxbd/YV9J+c4B23HLr9gr01OE6Tgj94="; + hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix index 7960b5cdc2..603809455f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Matplotlib Inline Back-end for IPython and Jupyter"; homepage = "https://github.com/ipython/matplotlib-inline"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miauth/default.nix index 7ebf4124dc..7070577839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miauth/default.nix @@ -1,19 +1,13 @@ { lib, + bluepy, buildPythonPackage, + cryptography, fetchPypi, + pytestCheckHook, pythonOlder, pythonRelaxDepsHook, - - # build-system setuptools, - - # dependencies - bluepy, - cryptography, - - # tests - pytestCheckHook, }: buildPythonPackage rec { @@ -28,14 +22,13 @@ buildPythonPackage rec { hash = "sha256-2/4nFInpdY8fb/b+sXhgT6ZPtEgBV+KHMyLnxIp6y/U="; }; - nativeBuildInputs = [ - setuptools - pythonRelaxDepsHook - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "cryptography" ]; - propagatedBuildInputs = [ + dependencies = [ bluepy cryptography ]; @@ -46,9 +39,9 @@ buildPythonPackage rec { meta = with lib; { description = "Authenticate and interact with Xiaomi devices over BLE"; - mainProgram = "miauth"; homepage = "https://github.com/dnandha/miauth"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "miauth"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 84a00dde64..890bdc7b0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index f35fa16cd4..d3fdfd625b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + cachecontrol, feedparser, fetchFromGitHub, gitpython, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.13.1"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-FxVyPks42hoj2y2epZjSNuTOvhDk3Vxm895a4teeSuw="; + hash = "sha256-4/sLwdScYatDXfAGbEsiYMdQ7IYMSlA3X1u04G3XcOc="; }; postPatch = '' @@ -33,6 +34,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + cachecontrol gitpython mkdocs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 67ad475441..fc72540e9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.3"; + version = "1.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-OiG/dPsWO2Z4lGUlgPePRcsrotCu+fwesKhhh6YjmnU="; + hash = "sha256-LRBo404TGxWBQdhN3gTyDHjB389hcHCfZK/oEFdjpOY="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix index d33527b1ec..9691fc3668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mouseinfo/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, pyperclip, @@ -7,7 +6,7 @@ xlib, pillow, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mouseinfo"; version = "0.1.3"; @@ -34,7 +33,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Application to display XY position and RGB color information for the pixel currently under the mouse. Works on Python 2 and 3"; homepage = "https://github.com/asweigart/mouseinfo"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mozilla-django-oidc/default.nix new file mode 100644 index 0000000000..78c24b8b0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mozilla-django-oidc/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, djangorestframework +, django +, josepy +, requests +, cryptography +}: + +buildPythonPackage rec { + pname = "mozilla-django-oidc"; + version = "4.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "mozilla-django-oidc"; + rev = version; + hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + djangorestframework + ]; + + checkPhase = '' + runHook preCheck + + PYTHONPATH=.:$PYTHONPATH DJANGO_SETTINGS_MODULE=tests.settings django-admin test + + runHook postCheck + ''; + + dependencies = [ + django + josepy + requests + cryptography + ]; + + meta = { + description = "Django OpenID Connect library"; + homepage = "https://github.com/mozilla/mozilla-django-oidc"; + changelog = "https://github.com/mozilla/mozilla-django-oidc/releases/tag/${src.rev}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix index 5b01bf17d3..937d489f6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -79,7 +79,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ bendlas - jonringer maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index 7a5effd2a8..9a18be120a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ bendlas - jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index c808871be4..4be14e8510 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-kniEDoRPXXgLWsxUAMv2PZfKrM+OtEKlXr2aA+JSLV4="; + hash = "sha256-dCJ8EfdtA0lPQ7d4hlmxYblPTe3vIwopEkEryMPJ5VM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index 7102d87286..a79a068f86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.7.2"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; + hash = "sha256-xPjyi5dFR9xVp1Fl6mM2JNKTRlLBQ6J9aB0dpjnZ+eQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 1dc1de3daa..d1a6903a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.21.0"; + version = "5.22.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-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0="; + hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index 50473f8465..e86e0c6255 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, jinja2, @@ -66,6 +65,5 @@ buildPythonPackage rec { changelog = "https://github.com/networktocode/netutils/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix index 89ab454cae..57efaa937f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nextcloudmonitor"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "meichthys"; repo = "nextcloud_monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-3RVGE1vMLtVkZ4+/GwnNs4onctSw1dz6bsV1CC/gnpM="; + hash = "sha256-HQLaHuvXWtHkG1dzD7ldvYKepTB4qQqzpKLYMR+lor4="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix index 0cda8c4cf0..8e122271c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { mainProgram = "num2words"; homepage = "https://github.com/savoirfairelinux/num2words"; license = licenses.lgpl21; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; longDescription = "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix index 0eae5c9a9b..d144bf4c96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -39,7 +38,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "numba_scipy" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Extends Numba to make it aware of SciPy"; homepage = "https://github.com/numba/numba-scipy"; changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix index 4b66456a41..10373acbd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -10,11 +10,12 @@ pytest-asyncio, pytestCheckHook, pytz, + syrupy, }: buildPythonPackage rec { pname = "odp-amsterdam"; - version = "6.0.1"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-teLjiclkbjlG226gMUgqc2IUEWqKcSm6xIekw+AQPU4="; + hash = "sha256-veBccNxqhqBYKUC5pdjZ1IOWUYUqiNK5pJq1L+8UCxA="; }; postPatch = '' @@ -32,14 +33,17 @@ buildPythonPackage rec { sed -i '/addopts/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pytz" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pytz ]; @@ -48,6 +52,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "odp_amsterdam" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix index c73147fadd..ab78e6eda1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, pkgs, lib, - stdenv, hfst, }: @@ -26,7 +25,5 @@ buildPythonPackage rec { homepage = "https://github.com/flammie/omorfi"; license = licenses.gpl3; maintainers = with maintainers; [ lurkki ]; - # Ofborg build error (hfst not found?) - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix index 1b4d713311..d1aaed5205 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix @@ -1,10 +1,10 @@ { lib, config, + addDriverRunpath, buildPythonPackage, fetchFromGitHub, fetchpatch, - addOpenGLRunpath, setuptools, pytestCheckHook, pythonRelaxDepsHook, @@ -57,6 +57,52 @@ buildPythonPackage rec { ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch ]; + postPatch = + let + quote = x: ''"${x}"''; + subs.ldFlags = + let + # Bash was getting weird without linting, + # but basically upstream contains [cc, ..., "-lcuda", ...] + # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] + old = [ "-lcuda" ]; + new = [ + "-lcuda" + "-L${addDriverRunpath.driverLink}" + "-L${cudaPackages.cuda_cudart}/lib/stubs/" + ]; + in + { + oldStr = lib.concatMapStringsSep ", " quote old; + newStr = lib.concatMapStringsSep ", " quote new; + }; + in + '' + # Use our `cmakeFlags` instead and avoid downloading dependencies + substituteInPlace python/setup.py \ + --replace "= get_thirdparty_packages(triton_cache_path)" "= os.environ[\"cmakeFlags\"].split()" + + # Already defined in llvm, when built with -DLLVM_INSTALL_UTILS + substituteInPlace bin/CMakeLists.txt \ + --replace "add_subdirectory(FileCheck)" "" + + # Don't fetch googletest + substituteInPlace unittest/CMakeLists.txt \ + --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ + --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" + + cat << \EOF > python/triton/common/build.py + + def libcuda_dirs(): + return [ "${addDriverRunpath.driverLink}/lib" ] + EOF + '' + + lib.optionalString cudaSupport '' + # Use our linker flags + substituteInPlace python/triton/common/build.py \ + --replace '${subs.ldFlags.oldStr}' '${subs.ldFlags.newStr}' + ''; + nativeBuildInputs = [ setuptools pythonRelaxDepsHook @@ -87,42 +133,6 @@ buildPythonPackage rec { setuptools ]; - postPatch = - let - # Bash was getting weird without linting, - # but basically upstream contains [cc, ..., "-lcuda", ...] - # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] - old = [ "-lcuda" ]; - new = [ - "-lcuda" - "-L${addOpenGLRunpath.driverLink}" - "-L${cudaPackages.cuda_cudart}/lib/stubs/" - ]; - - quote = x: ''"${x}"''; - oldStr = lib.concatMapStringsSep ", " quote old; - newStr = lib.concatMapStringsSep ", " quote new; - in - '' - # Use our `cmakeFlags` instead and avoid downloading dependencies - substituteInPlace python/setup.py \ - --replace "= get_thirdparty_packages(triton_cache_path)" "= os.environ[\"cmakeFlags\"].split()" - - # Already defined in llvm, when built with -DLLVM_INSTALL_UTILS - substituteInPlace bin/CMakeLists.txt \ - --replace "add_subdirectory(FileCheck)" "" - - # Don't fetch googletest - substituteInPlace unittest/CMakeLists.txt \ - --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ - --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" - '' - + lib.optionalString cudaSupport '' - # Use our linker flags - substituteInPlace python/triton/common/build.py \ - --replace '${oldStr}' '${newStr}' - ''; - # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index ac6fb58446..88e876035d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.1"; + version = "1.35.5"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GOduJdMNVWK3Hl05mQI7kpgzugEX2MJKEqTyR/ldW9Q="; + hash = "sha256-vtqqINwO08olJuynsFtsW7Kp8ikZI6tsZHZWnjTfitM="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix index e59e2a5dfa..a235fef5f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -29,6 +29,7 @@ pytestCheckHook, pytest-qt, pyqtgraph, + pyqt5, pyqtwebengine, python, python-louvain, @@ -113,6 +114,7 @@ let xlsxwriter httpx pyqtgraph + pyqt5 orange-widget-base keyrings-alt pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix index 96533b8236..0b083f5d2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-ze5mgFU3jc+hB1W2ayj4i2dBFJ0CXsZULzbdFMz3G3Y="; + hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index ef4b6f2c4b..5aa9bc1a58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -71,7 +70,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "oslo_concurrency" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Oslo Concurrency library"; mainProgram = "lockutils-wrapper"; homepage = "https://github.com/openstack/oslo.concurrency"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 882131c7c6..736267272e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.log"; license = licenses.asl20; maintainers = teams.openstack.members; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index 97488f2810..673296d719 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -21,21 +21,21 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.9.1"; + version = "1.9.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gboeing"; repo = "osmnx"; rev = "refs/tags/v${version}"; - hash = "sha256-od/0IuiK2CvrD0lfcTzkImK/5hcm6m61ULYzEtv/YeA="; + hash = "sha256-Tn800wFoPi5VkZmu9wUVM+EmCj/xxU2EJ6iwnA1VKXo="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ geopandas matplotlib networkx @@ -56,11 +56,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "osmnx" ]; - meta = with lib; { + meta = { description = "Package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX"; homepage = "https://github.com/gboeing/osmnx"; - changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ psyanticy ]; + changelog = "https://github.com/gboeing/osmnx/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psyanticy ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix index 039f24c983..c164b7c654 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-ZtIY4HvRllqlLlf3j1+RMJuuQuq+BZbMuMn9n/v8H5M="; + hash = "sha256-WEvNPtaKGJsbHLjGjSl0/9BewmLLMFLoN9SHMdEBoAM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix index 34381e4eb8..55373aaca9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pycryptodome ]; - pythonImportCheck = [ "pdfrw" ]; + pythonImportsCheck = [ "pdfrw" ]; meta = with lib; { description = "Pure Python library that reads and writes PDFs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index 43ef11bebd..c1657025e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.5.0"; + version = "14.5.1"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-lie+lPUVWVgbSGC09gMmy4Z2BdC2CHFYQ60isExvhSk="; + hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix index 6626c31c85..058b613fa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -70,6 +69,5 @@ buildPythonPackage rec { changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix index 979c19319c..aec7138b77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, async-timeout, buildPythonPackage, @@ -49,7 +48,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pescea" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python interface to Escea fireplaces"; homepage = "https://github.com/lazdavila/pescea"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 24fdc105e1..e947ce4a16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.4.0"; + version = "2.6.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WH6aklJP8Wk1XgxULedM/rIt6XWAV5ur9hOAta7TsD4="; + hash = "sha256-moH0BtoVAbyGJHh9kvKSUoArgsp/IFhG6+J2NOO+FRQ="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix index 091e9cfd97..5f76029900 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-k5MxpkCAvefSRoNPMAVIvNcCTU5HPicU4XSFXk13O9Q="; + hash = "sha256-J1i1H7AfQdiUIyBpgJK3dkH6C8MoEOwug4YQP+NEPbk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 30d02f2058..178e738ed1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system @@ -10,6 +10,9 @@ # propagates typing-extensions, + appdirs, + flexcache, + flexparser, # tests pytestCheckHook, @@ -22,15 +25,16 @@ buildPythonPackage rec { pname = "pint"; - version = "0.23"; + version = "0.24"; format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit version; - pname = "Pint"; - hash = "sha256-4VCbkWBtvFJSfGAKTvdP+sEv/3Boiv8g6QckCTRuybQ="; + src = fetchFromGitHub { + owner = "hgrecco"; + repo = "pint"; + rev = "refs/tags/${version}"; + hash = "sha256-zMcLC3SSl/W7+xX4ah3ZV7fN/LIGJzatqH4MNK8/fec="; }; nativeBuildInputs = [ @@ -38,15 +42,23 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ typing-extensions ]; + propagatedBuildInputs = [ + appdirs + flexcache + flexparser + typing-extensions + # Both uncertainties and numpy are not necessarily needed for every + # function of pint, but needed for the pint-convert executable which we + # necessarily distribute with this package as it is. + uncertainties + numpy + ]; nativeCheckInputs = [ pytestCheckHook pytest-subtests pytest-benchmark - numpy matplotlib - uncertainties ]; pytestFlagsArray = [ "--benchmark-disable" ]; @@ -55,13 +67,6 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTests = [ - # https://github.com/hgrecco/pint/issues/1898 - "test_load_definitions_stage_2" - # pytest8 deprecation - "test_nonnumeric_magnitudes" - ]; - meta = with lib; { changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES"; description = "Physical quantities module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index e40bea699f..75c281ae22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.4.1"; + version = "0.38.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-4B/rnwrkeridIgMD8gUVYXYVbrmQhQqDOa8Ot1ae/Ls="; + hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix index c889943748..69559b4ca2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Dynamic code loading framework for building pluggable Python distributions"; homepage = "https://github.com/localstack/plux"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index a93473db5c..cf51068bc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix index 64aa9d2793..9aa77f50b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM="; + hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY="; }; pythonRelaxDeps = [ "future" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix index 5092394d6a..53de4065ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/power/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/power/default.nix index 97c490523f..708f3e40a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/power/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/power/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -19,7 +18,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Cross-platform system power status information"; homepage = "https://github.com/Kentzo/Power"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index 6a09b16a5c..aa940d50ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, bash, buildPythonPackage, fetchFromGitHub, @@ -89,6 +88,5 @@ buildPythonPackage rec { changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index d6072ce02b..f1e852930f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/psutil"; changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix index b3bcbbacec..52e6abb804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.24"; + version = "1.25"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; + hash = "sha256-l97ZK9VT+kU9Hos91C7Q9Zhv3Dge3kyF7N//j4sZ5Kc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix index 874d345933..d6e76fcc1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Immutable URL class for easy URL-building and manipulation"; homepage = "https://github.com/codeinthehole/purl"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e5f32b9507..e86332342b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.19.0"; + version = "4.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-vyhX6TG3B6f1u49ngzdaCOZwSnEUQ2XMiq80bqCSmxU="; + hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix index 2070b0616c..2cbeb25693 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-/I/4ATvX/0ya8xtineXyjSFJBGhDNy/tosh2NdnKLK4="; + hash = "sha256-8i852bf0FRaorI3vJnuHTZSik6yoqtHr3wbafSvKmBM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix index 5cfa481395..b013c9b715 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybalboa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybalboa"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "garbled1"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7vjdRGnEnMf32pZwoKRxX16hxkyf0CXlncpbBJMQtfI="; + hash = "sha256-rSY6kU7F9ybpPXcmTM2WBazjb9tI2+8dG56pjrRXcKg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index df3af23c98..d8f1352137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "pybids"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 25afee42bf..081c08582b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.15.2"; + version = "0.15.3"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-DF+h+pipsm2uWQZm/1dvJ+Jse6cI/udU7Lngc1ntRYg="; + hash = "sha256-pI7gSdybD3Bk27j3Bksc865Iqhk/qv4Uq9QDobcQKBA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index f6a83e7c6e..577c25f8ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -58,7 +58,6 @@ let changelog = "https://github.com/PyDMD/PyDMD/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yl3dy ]; - broken = stdenv.hostPlatform.isAarch64; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix index 5c8eb0990f..6139d6b897 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Azure Cosmos DB API"; homepage = "https://github.com/Azure/azure-cosmos-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix index 1aad1ae666..9648fd9d20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.4"; + version = "2024.6.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-I1VS9uNKybokbkKh6QVjsf5cLV3vg19EnblOheAyxn8="; + hash = "sha256-ug9gADM6ig6i2mu3GhQ+vsbNf3vEfR4L7OQ5Ixuh5so="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix index c86678cbc4..4a9dd9f6a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-zLGJ8MYfyXrJwy8GywOq9fM9rMMmRTgPrgiByGwQ+gM="; + hash = "sha256-myqv7zNhSUZTdyujg0ogrbzpypA5APGJhTM+FtrgXNA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix index 32f0016dee..e838e7c215 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.8.3"; + version = "0.8.7"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ChrisMandich"; repo = "PyFlume"; rev = "refs/tags/v${version}"; - hash = "sha256-RtzbAXjMtvKc8vnZIxIJnc6CS+BrYcQgdy5bVaJumg0="; + hash = "sha256-/8gLKe+6GaPQe0J3YBmOVcAcAcqfrWM7UQCoX+qOEmw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index e154e6f9a1..81cc96051c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "1.5.9"; + version = "1.5.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; + hash = "sha256-jb3rEhW8ui+3SNrjH/2xqwCFQMKNE7NwThePNooIcSg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix index 2310bfb1f7..ccc9d2726d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix @@ -2,8 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - marshmallow, marshmallow-dataclass, + marshmallow, + pdm-backend, pytestCheckHook, pythonOlder, pythonRelaxDepsHook, @@ -16,29 +17,36 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.14.0"; + version = "1.15.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; + hash = "sha256-jmjlNGyGYsiwQ0qi8KiSUI38J4n1ZTzqxzY9Bn9OdqY="; }; - pythonRelaxDeps = [ "marshmallow-dataclass" ]; + pythonRelaxDeps = [ + "marshmallow-dataclass" + "setuptools" + ]; + + build-system = [ + pdm-backend + ]; nativeBuildInputs = [ pythonRelaxDepsHook - setuptools ]; - propagatedBuildInputs = [ + dependencies = [ marshmallow marshmallow-dataclass requests + setuptools typing-extensions ]; @@ -65,6 +73,7 @@ buildPythonPackage rec { "test_multiscan_parameters" "test_quota_overview" "test_rate_limit" + "test_read_metadata_bad_response" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index af11516e85..fe3c2dc444 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyinsteon"; repo = "pyinsteon"; rev = "refs/tags/${version}"; - hash = "sha256-V1sYLKKlTMG9Km53uNCU34e8D/owxuDNT+HGZxtK21I="; + hash = "sha256-SyhPM3NS7iJX8jwTJ4YWZ72eYLn9JT6eESekPf5eCKI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix index 30dcee778a..c2555281a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix @@ -2,43 +2,37 @@ lib, buildPythonPackage, deprecated, - fetchFromGitHub, - importlib-metadata, + fetchFromGitea, + importlib-resources, jaconv, py-cpuinfo, pytest-benchmark, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pykakasi"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "miurahr"; repo = "pykakasi"; rev = "refs/tags/v${version}"; - hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; + hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "klepto"' "" - ''; - build-system = [ setuptools-scm ]; dependencies = [ jaconv deprecated - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; nativeCheckInputs = [ py-cpuinfo @@ -51,16 +45,18 @@ buildPythonPackage rec { "test_benchmark" "pytest_benchmark_update_machine_info" "pytest_benchmark_update_json" + # Assertion error + "test_aozora" ]; pythonImportsCheck = [ "pykakasi" ]; meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; - mainProgram = "kakasi"; - homepage = "https://github.com/miurahr/pykakasi"; - changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; - license = licenses.mit; + homepage = "https://codeberg.org/miurahr/pykakasi"; + changelog = "https://codeberg.org/miurahr/pykakasi/src/tag/v${version}/CHANGELOG.rst"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "kakasi"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix index d19fcc9039..468a00d8ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -13,7 +12,7 @@ }: let - pylibjpeg-data = buildPythonPackage rec { + pylibjpeg-data = buildPythonPackage { pname = "pylibjpeg-data"; version = "1.0.0dev0"; pyproject = true; @@ -64,8 +63,5 @@ buildPythonPackage rec { changelog = "https://github.com/pydicom/pylibjpeg/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; - # several test failures of form - # "pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. ..." - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index d3c34f4c05..0b33812e65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.8"; + version = "3.6.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-6Rt5fbuaeAgbW5KKse1zZIJyq/p2P2MjXGwA7q0C7wA="; + hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix index 5c63fcae29..3339b77b98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -88,7 +87,5 @@ buildPythonPackage rec { changelog = "https://github.com/pydicom/pynetdicom/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - # Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work - broken = stdenv.isDarwin || stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix index a115cd7239..762771c66a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + cudaPackages, fetchFromGitHub, substituteAll, pythonOlder, @@ -8,6 +9,7 @@ setuptools, pytestCheckHook, versioneer, + pynvml, }: buildPythonPackage rec { @@ -50,6 +52,13 @@ buildPythonPackage rec { # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory doCheck = false; + passthru.tests.tester-nvmlInit = cudaPackages.writeGpuTestPython { libraries = [ pynvml ]; } '' + import pynvml + from pynvml.smi import nvidia_smi # noqa: F401 + + print(f"{pynvml.nvmlInit()=}") + ''; + meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; homepage = "https://github.com/gpuopenanalytics/pynvml"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyogrio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyogrio/default.nix index 551fde29ba..63f798d21d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyogrio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyogrio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,15 +25,12 @@ buildPythonPackage rec { owner = "geopandas"; repo = "pyogrio"; rev = "v${version}"; - hash = "sha256-h4Rv5xOWSJSv0nLbosviz5EiF/IsZO5wzBel9YRd0Bg="; + hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" - '' + lib.optionalString (!pythonOlder "3.12") '' - substituteInPlace setup.py \ - --replace-fail "distutils" "setuptools._distutils" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenweathermap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenweathermap/default.nix index a683857c12..6b316dd72c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.0.10"; + version = "0.1.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00="; + hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 718b0be184..6bfa11c30f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -5,14 +5,13 @@ fetchFromGitHub, scipy, numpy, - pyqt5, + pyqt6, pyopengl, - qt5, + qt6, pytestCheckHook, freefont_ttf, makeFontsConf, setuptools, - python, }: let @@ -34,15 +33,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - pyqt5 scipy pyopengl ]; + buildInputs = [ + # Not propagating it so that every consumer of this package will be able to + # use any of the upstream supported Qt Library, See: + # https://pyqtgraph.readthedocs.io/en/pyqtgraph-0.13.7/getting_started/how_to_use.html#pyqt-and-pyside + pyqt6 + ]; nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' - export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks export FONTCONFIG_FILE=${fontsConf} @@ -65,13 +69,12 @@ buildPythonPackage rec { "test_rescaleData" ]; - meta = with lib; { + meta = { description = "Scientific Graphics and GUI Library for Python"; homepage = "https://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; - license = licenses.mit; - broken = lib.versionAtLeast python.version "3.12"; - platforms = platforms.unix; - maintainers = with maintainers; [ koral ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ koral doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 39e57b6331..bdb4bb06c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -1,11 +1,14 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, pytest, runCommand, boringssl, + libiconv, + SystemConfiguration, }: let @@ -41,6 +44,11 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + SystemConfiguration + ]; + env.BORING_BSSL_PATH = boringssl-wrapper; optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix index 9bc9363e02..236d040cb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -32,6 +31,5 @@ buildPythonPackage rec { changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix index 9c6fc48a96..7197bb1b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysmt"; - version = "0.9.5"; + version = "0.9.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pysmt"; repo = pname; rev = "v${version}"; - hash = "sha256-cE+WmKzggYof/olxQb5M7xPsBONr39KdjOTG4ofYPUM="; + hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix index a0335d886a..eaae70a257 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unofficial python api for Erowid, PsychonautWiki and AskTheCaterpillar"; homepage = "https://github.com/OpenJarbas/PySychonaut"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix index a7802b2cb7..0064ba62fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyannotate, @@ -32,7 +31,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_annotate" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Generate PyAnnotate annotations from your pytest tests"; homepage = "https://github.com/kensho-technologies/pytest-annotate"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix index 920f4c755a..5e07b68d98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Pytest plugin to enable format checking with black"; homepage = "https://github.com/shopkeep/pytest-black"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix index 6442d27f35..4d784be7c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pytest external process plugin"; homepage = "https://github.com/pytest-dev"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fullykiosk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fullykiosk/default.nix index 3e3a65ff98..66b6cb4528 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fullykiosk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fullykiosk/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fullykiosk"; - version = "0.0.13"; + version = "0.0.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cgarwood"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GElLaSSr/EEhtjgasP2C79kf+HluVPuQ21I8La7IvLs="; + hash = "sha256-+JBgBi05zNgIt2cXlHjFPI6nBFR7SpMCWIQHKtnZeX4="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-logging-loki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-logging-loki/default.nix new file mode 100644 index 0000000000..fe22ed58b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-logging-loki/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + rfc3339, + requests, + freezegun, +}: + +buildPythonPackage rec { + pname = "python-logging-loki"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GreyZmeem"; + repo = "python-logging-loki"; + rev = "refs/tags/v${version}"; + hash = "sha256-1qHuv+xzATo11au+QAhD1lHcLJtnVKZDdQDGohHUhiI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + rfc3339 + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + freezegun + ]; + + # ValueError + # Considering that the package has not been updated since 2019, it is likely that this test is broken + disabledTests = [ "test_can_build_tags_from_converting_dict" ]; + + pythonImportsCheck = [ "logging_loki" ]; + + meta = { + description = "Python logging handler for Loki"; + homepage = "https://github.com/GreyZmeem/python-logging-loki"; + changelog = "https://github.com/GreyZmeem/python-logging-loki/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix index 7f5dc62feb..bef8dadf31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-opensky"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-Ia6/Lr/uNuF1u0s4g0tpYaW+hKeLbUKxYC/O+ZBqiXI="; + hash = "sha256-V6iRwWzCnPCvu8eks2sHPYrX3OmaFnNj+i57kQJKYm0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 261624e190..02e5507363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.3.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-YjD/aTSUeVuMyrdC2dcKgIqeBC+8NircRFLh2+mbD+8="; + hash = "sha256-W+xq6FwBZNjrqivAWv821h5Pak0wGaksQoYN5EULSnA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 1825c58e18..2ed6d3aeca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.11.2"; + version = "5.11.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-t5QbuXjipLaf9GV+N5FLq45xJPK2/FUaM/0s8RNPTzo="; + hash = "sha256-8LpTrDxugZS6skSRCcDK4+sbSYV9ZBRSma4QfIXFJT8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix index e3b493f438..cfe1dbd671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix @@ -3,24 +3,26 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pytestCheckHook, pythonOlder, + setuptools-scm, setuptools, tdlib, telegram-text, - pytestCheckHook, }: buildPythonPackage rec { pname = "python-telegram"; - version = "0.18.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.19.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "alexander-akhmetov"; repo = "python-telegram"; - rev = version; - hash = "sha256-2Q0nUZ2TMVWznd05+fqYojkRn4xfFZJrlqb1PMuBsAY="; + rev = "refs/tags/${version}"; + hash = "sha256-JnU59DZXpnaZXIY/apXQ2gBgiwT12rJIeVqzaP0l7Zk="; }; postPatch = '' @@ -28,12 +30,14 @@ buildPythonPackage rec { rm -fr telegram/lib substituteInPlace telegram/tdjson.py \ - --replace "ctypes.util.find_library(\"tdjson\")" \ + --replace-fail "ctypes.util.find_library(\"tdjson\")" \ "\"${tdlib}/lib/libtdjson${stdenv.hostPlatform.extensions.sharedLibrary}\"" ''; - propagatedBuildInputs = [ - setuptools + build-inputs = [ setuptools ]; + + dependencies = [ + setuptools-scm telegram-text ]; @@ -46,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Telegram's tdlib"; homepage = "https://github.com/alexander-akhmetov/python-telegram"; + changelog = "https://github.com/alexander-akhmetov/python-telegram/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix index b761430a27..b61ff59556 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-application/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, isPy3k, buildPythonPackage, @@ -30,7 +29,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "application" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Collection of modules that are useful when building python applications"; homepage = "https://github.com/AGProjects/python3-application"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index d5c7532b47..f3524637c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.29.1"; + version = "0.29.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-fKeNQifSCxsqR2mhK2w5kG669byYNNLkfxAYTUtfWE0="; + hash = "sha256-Ocs3iwr4AwV6SxjZ4ylJYHy+/Jnt4bYeeMKJ6VVLWJA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix index 31cc3dabb1..9f78f9d2f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -11,7 +10,7 @@ texlive, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytikz-allefeld"; # "pytikz" on pypi is a different module version = "unstable-2022-11-01"; pyproject = true; @@ -54,6 +53,5 @@ buildPythonPackage rec { description = "Python interface to TikZ"; license = licenses.gpl3; maintainers = with maintainers; [ pbsds ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix index 6243ae776d..8650e0c54f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyttsx3/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, - espeak-ng, }: buildPythonPackage rec { @@ -22,7 +20,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Offline text-to-speech synthesis library"; homepage = "https://github.com/nateshmbhat/pyttsx3"; license = licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 53ea4ed0c9..b17b67b0c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.107"; + version = "9.2.108"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-e8DZgHCVUcAEgo9IR7Ut/v580//oeH9l1MwGSe/RThw="; + hash = "sha256-N1sGTjDiqmwyXdXpApUgVAmUPjwJUiEIaTZoWyrBpAs="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix index c47817f21b..ed985d2332 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pywaze"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-sWI9kUR0SSqE97an/YfvhQqmrK+OEWXRzG4MBYyp8Jg="; + hash = "sha256-fShfnfYhUtthwHSFYIFj2cWE9dZXakTrfqiR3AL2nb8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix index 317ce298df..84cec559cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; homepage = "https://github.com/tanbro/pyyaml-include"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix index bb3c41e5b0..4d5b62c620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.29.0"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cIfX9MpRMXtBfLKHKTzCLkv31fBIyanTQHEs8hHk7aQ="; + hash = "sha256-umLTTbz0h+g2j2wZdioZ4cXwavfnBfbFg8BjKzW8z30="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix index 60ba6862af..959c5e1d52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix index cf243178e1..802f7061a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,8 +1,11 @@ { cp310 = { - hash = "sha256-m8SBwbXXKU1ocvrBROAOoTlLfhMPtBJJ0WcNtJQVbYE="; + hash = "sha256-iSKDUwJTakE1nStvaMvJ5RwS7+a9JiurOe8wcRjs7Ik="; }; cp311 = { - hash = "sha256-4gO1dWWgCPKsn54ekpIW4NfXdvU0FEzMePZsEFI09wE="; + hash = "sha256-SQ7tIqb+XWqWqUYxAT8PTT9SBnl1us6soJiy9zLHJQI="; + }; + cp312 = { + hash = "sha256-ri2m867sokJjB3wB7yOEEQczRzMglzbCJ0vOomJDhGI="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix index f32bd388d5..d0869e8afc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix @@ -53,13 +53,13 @@ let pname = "ray"; - version = "2.30.0"; + version = "2.31.0"; in buildPythonPackage rec { inherit pname version; format = "wheel"; - disabled = pythonOlder "3.10" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.13"; src = let diff --git a/third_party/nixpkgs/pkgs/development/python-modules/refery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/refery/default.nix index 1d434c4d56..cddfa64d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/refery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/refery/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { junit-xml ]; - pythonImportCheck = [ "refery" ]; + pythonImportsCheck = [ "refery" ]; disabled = pythonOlder "3.10"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix index b3d78e8a12..de1c0e5fd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = [ "requests_gssapi" ]; + pythonImportsCheck = [ "requests_gssapi" ]; meta = with lib; { description = "GSSAPI authentication handler for python-requests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index 1ef168dbe4..9b62f910e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.11"; + version = "0.8.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-XygVfIf6zlKy2kv/9TKLG8MpYX4YnzYIKiSG7nP5YI8="; + hash = "sha256-CcnGfiJuv3hzez/G/Nu4OyruPL+bbSAtMAfGruqyPUU="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix index 1b3325e457..d270fb5049 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rioxarray"; - version = "0.15.5"; + version = "0.15.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "corteva"; repo = "rioxarray"; rev = "refs/tags/${version}"; - hash = "sha256-bumFZQktgUqo2lyoLtDXkh6Vv5oS/wobqYpvNYy7La0="; + hash = "sha256-x5+T1ITZ6t+08s+WpSiqbohiKVfigREn63+5pJYHkxc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix index b7a4c9964c..b7f1233271 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -38,6 +37,5 @@ buildPythonPackage rec { homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtfde/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtfde/default.nix index fd49c3d124..d436f19a45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtfde/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtfde/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rtfde"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,15 +21,9 @@ buildPythonPackage rec { owner = "seamustuohy"; repo = "RTFDE"; rev = "refs/tags/${version}"; - hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4="; + hash = "sha256-zmcf9wqlKz55dOIchUC9sgW0PcTCPc52IkbIonOFlmU="; }; - postPatch = '' - # https://github.com/seamustuohy/RTFDE/issues/31 - substituteInPlace setup.py \ - --replace-fail "==" ">=" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -44,6 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "RTFDE" ]; + disabledTests = [ + # Content mismatch + "test_bin_data_captured" + ]; + meta = with lib; { description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies"; homepage = "https://github.com/seamustuohy/RTFDE"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix index ea4dc582c5..a4a729ce42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "StarCraft II - client protocol"; - homepage = "https://github.com/Blizzard/sc2client-proto"; + homepage = "https://github.com/Blizzard/s2client-proto"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix index 3d4e0134d5..780f856084 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Classes implementing the SARIF 2.1.0 object model"; homepage = "https://github.com/microsoft/sarif-python-om"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index a3ca41383b..10d557f774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.1.0"; + version = "32.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WjVtE+3KtFdtBLqNUzFwDrWAUQLblE+DNGjABH+5zWc="; + hash = "sha256-P5Lmosa8PrqDYEbdoDLnby0ET4KsfbLWzXHmWHhy8ss="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix index df14875267..db2a741ccd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Implementation of the SCRAM authentication protocol"; homepage = "https://github.com/tlocke/scramp"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix index 6bbe9e2b5a..0d2a5cf8bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Adds optional security headers and cookie attributes for Python web frameworks"; homepage = "https://github.com/TypeError/secure.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix index f6bf8c953e..f0c1f25d13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix @@ -5,36 +5,37 @@ natsort, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "seedir"; - version = "0.4.2"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "earnestt1234"; - repo = pname; + repo = "seedir"; rev = "refs/tags/v${version}"; - hash = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; + hash = "sha256-ilL2KKN5sJclVcStO/kZoacsPoMgcFW1/8M/PQjxw/U="; }; - propagatedBuildInputs = [ natsort ]; + build-system = [ setuptools ]; + + dependencies = [ natsort ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "seedir" ]; - pytestFlagsArray = [ "tests/tests.py" ]; - meta = with lib; { description = "Module for for creating, editing, and reading folder tree diagrams"; - mainProgram = "seedir"; homepage = "https://github.com/earnestt1234/seedir"; changelog = "https://github.com/earnestt1234/seedir/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "seedir"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index 6bd80826b7..b2b79711c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -36,7 +35,6 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index d311ce0c5f..b3f99bf3ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-aAPDYg5ttOAkKF5c1ft2apIQoReh4t22+78PtmLZNlI="; + hash = "sha256-jHYXqlRV1JR95GtO9E6oYj69Jj8TsvLANcI1kl7/Gl4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sev-snp-measure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sev-snp-measure/default.nix index c6795d1318..b5d7067759 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sev-snp-measure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sev-snp-measure/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "sev-snp-measure"; - version = "0.0.9"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "virtee"; repo = "sev-snp-measure"; - rev = "v${version}"; - hash = "sha256-efW4DMple26S3Jizc7yAvdPjVivyMJq4fEdkuToamGc="; + rev = "refs/tags/v${version}"; + hash = "sha256-M+d9uIAQvEmEsdhhjlwHbhB2RhlaGjphN4ov2ipzCFY="; }; nativeBuildInputs = [ @@ -29,11 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - postPatch = '' - # See https://github.com/virtee/sev-snp-measure/pull/46 - sed -i '/types-cryptography/d' setup.cfg requirements.txt - ''; - pythonImportsCheck = [ "sevsnpmeasure" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index b97840fbae..599e853e5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix @@ -17,12 +17,9 @@ python, sympy, meshio, - mpi4py, - psutil, openssh, pyvista, pytest, - stdenv, }: buildPythonPackage rec { @@ -89,6 +86,5 @@ buildPythonPackage rec { description = "Simple Finite Elements in Python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ wd15 ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index abf29ffaff..926bc4d48c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin || pythonAtLeast "3.12"; + broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index cce3de84a0..6eb35709fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.29.0"; + version = "3.30.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; + hash = "sha256-KJC0M5sk1dlCzadQ1/MBEnWuAGva/MP2MygqehH2fTg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix deleted file mode 100644 index 9f1d3e92c0..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - aiohttp, - boto3, - buildPythonPackage, - fetchFromGitHub, - flask, - flask-sockets, - pythonOlder, - mock, - moto, - psutil, - pytest-mock, - pytestCheckHook, - requests, - responses, - sqlalchemy, - websockets, - websocket-client, -}: - -buildPythonPackage rec { - pname = "slackclient"; - version = "3.29.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "slackapi"; - repo = "python-slack-sdk"; - rev = "refs/tags/v${version}"; - hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; - }; - - propagatedBuildInputs = [ - aiohttp - websocket-client - requests - ]; - - nativeCheckInputs = [ - boto3 - flask - flask-sockets - mock - moto - psutil - pytest-mock - pytestCheckHook - responses - sqlalchemy - websockets - ]; - - pytestFlagsArray = [ - # Exclude tests that requires network features - "--ignore=integration_tests" - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - disabledTests = - [ - "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" - "test_interactions" - "test_send_message_while_disconnection" - ] - ++ lib.optionals stdenv.isDarwin [ - # these fail with `ConnectionResetError: [Errno 54] Connection reset by peer` - "test_issue_690_oauth_access" - "test_issue_690_oauth_v2_access" - "test_send" - "test_send_attachments" - "test_send_blocks" - "test_send_dict" - ]; - - pythonImportsCheck = [ "slack" ]; - - meta = with lib; { - description = "Client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; - homepage = "https://github.com/slackapi/python-slackclient"; - changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ - flokli - psyanticy - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/default.nix new file mode 100644 index 0000000000..54dd8e2c20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, ply +, setuptools +, poetry-core +, withOpenSCAD ? false +, openscad +}: +buildPythonPackage rec { + pname = "solidpython2"; + version = "2.1.0"; + pyproject = true; + src = fetchFromGitHub { + owner = "jeff-dh"; + repo = "SolidPython"; + rev = "v${version}"; + hash = "sha256-Tq3hrsC2MmueCqChk6mY/u/pCjF/pFuU2o3K+qw7ImY="; + }; + + # NOTE: this patch makes tests runnable outside the source-tree + # - it uses diff instead of git-diff + # - modifies the tests output to resemble the paths resulting from running inside the source-tree + # - drop the openscad image geneneration tests, these don't work on the nix sandbox due to the need for xserver + patches = [ ./difftool_tests.patch ]; + + propagatedBuildInputs = lib.optionals withOpenSCAD [openscad]; + + build-system = [ + poetry-core + ]; + dependencies = [ + ply + setuptools + ]; + pythonImportsCheck = [ "solid2" ]; + checkPhase = '' + runHook preCheck + python $TMPDIR/source/tests/run_tests.py + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://github.com/jeff-dh/SolidPython"; + description = "A python frontend for solid modelling that compiles to OpenSCAD"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ jonboh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/difftool_tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/difftool_tests.patch new file mode 100644 index 0000000000..a5c950a9fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/solidpython2/difftool_tests.patch @@ -0,0 +1,35 @@ +diff --git a/tests/examples_test.py b/tests/examples_test.py +index 77204fd..9784389 100644 +--- a/tests/examples_test.py ++++ b/tests/examples_test.py +@@ -48,14 +48,19 @@ class ExamplesTest(unittest.TestCase): + subprocess.check_call(["python3", f.as_posix()]) + # copy generated scad file to examples_scad/ + copyWithRelativeIncludes(f.with_suffix(".scad"), test_scad_file) +- # call git diff test/examples_scad/{f}.scad +- diff = subprocess.check_output(["git", "diff", +- test_scad_file.as_posix()]) +- # make sure there's no diff +- self.assertEqual(diff.decode(), "") +- # render with openscad +- subprocess.check_call([get_openscad_executable(), "-o", +- test_scad_file.with_suffix(".png"), +- "--preview", "-", +- test_scad_file], +- stderr=subprocess.DEVNULL) ++ subprocess.check_call( ++ [ ++ "sed", ++ "-i", ++ f"s#^include <.*/solid2#include <../../solid2#g", ++ test_scad_file.as_posix(), ++ ] ++ ) ++ nixsrc = os.getenv("src") ++ subprocess.check_call( ++ [ ++ "diff", ++ f"{nixsrc}/tests/examples_scad/{f.with_suffix('.scad').name}", ++ test_scad_file.as_posix(), ++ ] ++ ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix index 85c8b23e68..a8409208c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, commonmark, fetchFromGitHub, @@ -16,7 +15,7 @@ yapf, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-markdown-parser"; version = "0.2.4"; pyproject = true; @@ -62,6 +61,5 @@ buildPythonPackage rec { homepage = "https://github.com/clayrisser/sphinx-markdown-parser"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 91ef0ec209..e86ea75eb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -11,20 +11,19 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.23.0"; + version = "2.24.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dfr+CCOdqubBb6po9gtXddQMQRByXhp8VFrUx/tm1Og="; + hash = "sha256-OWr4HmQghlUa8VcnDN/nQsFzlAWHG6nawfplG4ZJ7w0="; }; propagatedBuildInputs = [ redis requests - six urllib3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix index e683eac23e..37d133ef17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { mainProgram = "sshtunnel"; homepage = "https://github.com/pahaz/sshtunnel"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/std-uritemplate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/std-uritemplate/default.nix index 83c17826ff..be7ff2030c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-Mf7o2nDbj663cdC6OfXIK/newY1NKnUpWTniowXlNvE="; + hash = "sha256-lJ2YDTjUI3mf9Jh6g17rXppFRD3GGpzIMEYdkmz0JuQ="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix index 174cca93a3..0abcbcf4be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { homepage = "https://github.com/dropbox/stone"; changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "stone"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 0ec6c7bfc6..dba3b10114 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.235.0"; + version = "0.235.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-M9GwddyLfwGhA1z+imEOiNrXYFM2gFT9IcFf/8cRHAE="; + hash = "sha256-jfV1/n5YbVn658PF7PTIWV17UwEglFjszZufb+yy5ug="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix index 01587d4916..ba23f550e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/abcminiuser/python-elgato-streamdeck"; license = licenses.mit; maintainers = with maintainers; [ majiir ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index c993e18781..651ebc5597 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, pythonOlder, fetchPypi, @@ -79,7 +78,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index 96c004b5ab..793a83c3bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://hitchdev.com/strictyaml/"; changelog = "https://hitchdev.com/strictyaml/changelog/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix index 9b2fb010b0..72ac8b5794 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.10.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-jqd68Npt7qq9aMWO3AVR4JRAs9avO4x9u+MC/brU1Cw="; + hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix index 12dacb1586..6666d2db45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for calculating, analyzing, and visualizing drug combination synergy"; homepage = "https://github.com/djwooten/synergy"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2fd63f5e1d..b0b70c71d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1173"; + version = "3.0.1178"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-rCfTgK6ZfddBofxOfA1ilRwUGRkYTj4NpDEFRfpjSEk="; + hash = "sha256-5G+XVi1wmvWanBgra6JokLmfPaYIEETjQOAWV/mqTAI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix index 4be63b1b4b..bcd58d8cc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.6.1"; + version = "0.6.2"; 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-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE="; + hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix index dd59406a7d..4f3fbb94be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-jTTpeIWZD61UZkQWW5q/c0vgViT76qjDXw4qXfNqDnA="; + hash = "sha256-DX2s3Z3QM8qzUr5nM+9erJG/XHkB96h8S4+KYDfcA8A="; }; postPatch = '' @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = { description = "Allows using docker containers for functional and integration testing"; homepage = "https://github.com/testcontainers/testcontainers-python"; + changelog = "https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix index 4a125dd177..d70ed13e37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; + hash = "sha256-F/h2XhzLA89CwgorKhrvKrajFbT9maiF3RBkulQQ9bk="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix index f9d5cd97c1..e2899c081e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix @@ -8,6 +8,7 @@ pythonAtLeast, pythonOlder, addOpenGLRunpath, + callPackage, cudaPackages, future, numpy, @@ -15,6 +16,7 @@ pyyaml, requests, setuptools, + torch-bin, typing-extensions, sympy, jinja2, @@ -119,6 +121,8 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; + passthru.gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; + meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; homepage = "https://pytorch.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index d5d7e823be..9597a047bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -24,6 +24,10 @@ mpi, buildDocs ? false, + # tests.cudaAvailable: + callPackage, + torchWithCuda, + # Native build inputs cmake, symlinkJoin, @@ -639,11 +643,12 @@ buildPythonPackage rec { rocmSupport rocmPackages ; + cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; + tests = callPackage ./tests.nix { }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/gpu-checks.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/gpu-checks.nix new file mode 100644 index 0000000000..55a4b45f71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/gpu-checks.nix @@ -0,0 +1,40 @@ +{ + lib, + torchWithCuda, + torchWithRocm, + callPackage, +}: + +let + accelAvailable = + { + feature, + versionAttr, + torch, + cudaPackages, + }: + cudaPackages.writeGpuTestPython + { + inherit feature; + libraries = [ torch ]; + name = "${feature}Available"; + } + '' + import torch + message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" + assert torch.cuda.is_available() and torch.version.${versionAttr}, message + print(message) + ''; +in +{ + tester-cudaAvailable = callPackage accelAvailable { + feature = "cuda"; + versionAttr = "cuda"; + torch = torchWithCuda; + }; + tester-rocmAvailable = callPackage accelAvailable { + feature = "rocm"; + versionAttr = "hip"; + torch = torchWithRocm; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/tests.nix new file mode 100644 index 0000000000..5a46d08868 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/tests.nix @@ -0,0 +1,3 @@ +{ callPackage }: + +callPackage ./gpu-checks.nix { } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 0ade95bd96..2fcdd1be47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.8"; + version = "0.13.9"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-Y01O3fNWAyV8MhYY2FSMajWyc4Rle2XjsL261jWlfP8="; + hash = "sha256-lFC9e7nSPl4zo8nljhjwWLRMnZw0ymZLSYGnlaqfse8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -81,6 +81,7 @@ buildPythonPackage rec { description = "Python library for communicating with Trezor Hardware Wallet"; mainProgram = "trezorctl"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; + changelog = "https://github.com/trezor/trezor-firmware/blob/python/v${version}/python/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ np diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index c29aa09876..e70bfcdc80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.3"; + version = "7.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rpHDbWNfMRrNOH/iXKmt45FxwInIENgCiUQtcCPvQgU="; + hash = "sha256-iYx9qpZmf2r8Ndynx+jyyrLnAmB56NgjleUoLtyz+20="; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix index dc6662caa3..bf1379dd2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.8.2"; + version = "1.8.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE="; + hash = "sha256-1RctamOSnpZ+bcfwnCsj4OAR7KYzf0XQtSe7MTFMGy4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 0d0cc3e6ec..9fdcd16b00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240602"; + version = "2.32.0.20240622"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P5jXu9DdlOvRD/Q6f74gw7hSisrObY76/vC2oYR5PwY="; + hash = "sha256-7V6KQS/MORWdYxk4XACdZChF8lDGOQJxj2Bc2Q+q3jE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index a098bb8c45..db120296a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -1,31 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, - future, + setuptools-scm, + fetchFromGitHub, + pytestCheckHook, numpy, - pynose, }: buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.7"; - format = "setuptools"; + version = "3.2.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-gBEeCDnyOcWyM8tHcgF7SDoLehVzpYG5Krd0ajXm+qs="; + src = fetchFromGitHub { + owner = "lmfit"; + repo = "uncertainties"; + rev = "refs/tags/${version}"; + hash = "sha256-AaFazHeq7t4DnG2s9GvmAJ3ni62PWHR//mNPL+WyGSI="; }; - propagatedBuildInputs = [ future ]; - nativeCheckInputs = [ - pynose - numpy + nativeBuildInputs = [ + setuptools-scm ]; - checkPhase = '' - nosetests -sve test_1to2 - ''; + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix index e9bb746f7d..da684d6674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.15.4"; + version = "0.15.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+9has/2wlvmcgmaiCnV4qPMTCtSfR86osTjACIg7e2E="; + hash = "sha256-mLAX9B+9nPSBHJTDgBOLU1l58LkAkdywfdN58eSqP+I="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix index 1bfcce4e43..198b179498 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.8"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "unifi-discovery"; rev = "refs/tags/v${version}"; - hash = "sha256-gE/2awyhDACrc0nuTvTPOcK2lFbPIZAXDPRnVJtWFco="; + hash = "sha256-Ea+zxV2GUAaG/BxO103NhOLzzr/TNJaOsynDad2/2VA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix index d6f3389540..690db790d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "PHPUnit-like @dataprovider decorator for unittest"; homepage = "https://github.com/yourlabs/unittest-data-provider"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 5cc743b9e3..98a2531fa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.14.7"; + version = "0.14.8"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-V4LUo3di25IJ09KOPwcrOfgPxxgdRbFJHiBkWYnmxYc="; + hash = "sha256-cZBoGKjIWHJxbG6sDbkjJJt3nSYjrha+Lz9RFdq6d0c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix index a1170ed32f..0798fd1812 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.6"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-e8LYywKA5lNZ4UYFZTwcfePDWB4cTNz38Tiy4xzOxOs="; + hash = "sha256-y06/XqdmGXTd2Qhr2iXnmIKCSpAetXwI1UXv555ewoc="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uritools/default.nix index f02a31917c..946bb76e40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uritools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uritools/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.2"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BN8reH0Ot2IA6DGTgqA1Yvv+R0H9ZsFVBrCNO4IR1XM="; + hash = "sha256-7gahgqnISUZM6dX6kXU5qsyO3SpJJNG3qr7uyryuO8I="; }; pythonImportsCheck = [ "uritools" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix index 41fecf60da..a2fe7abb3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix @@ -1,21 +1,19 @@ { + lib, buildPythonPackage, fetchFromGitLab, - lib, - nix-update-script, pytestCheckHook, python-dateutil, pythonAtLeast, pythonOlder, + pythonRelaxDepsHook, + setuptools, }: -let - version = "0.15.4"; -in -buildPythonPackage { - inherit version; +buildPythonPackage rec { pname = "vcard"; - format = "setuptools"; + version = "0.16.1"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; @@ -23,25 +21,29 @@ buildPythonPackage { owner = "engmark"; repo = "vcard"; rev = "refs/tags/v${version}"; - hash = "sha256-7GNq6PoWZgwhhpxhWOkUEpqckeSfzocex1ZGN9CTJyo="; + hash = "sha256-cz1WF8LQsyJwcVKMSWmFb6OB/JWyfc2FgcOT3jJ45Cg="; }; - propagatedBuildInputs = [ python-dateutil ]; + pythonRelaxDeps = [ "python-dateutil" ]; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "vcard" ]; - passthru.updateScript = nix-update-script { }; - meta = { - homepage = "https://gitlab.com/engmark/vcard"; description = "vCard validator, class and utility functions"; longDescription = '' This program can be used for strict validation and parsing of vCards. It currently supports vCard 3.0 (RFC 2426). ''; + homepage = "https://gitlab.com/engmark/vcard"; license = lib.licenses.agpl3Plus; mainProgram = "vcard"; - maintainers = [ lib.maintainers.l0b0 ]; + maintainers = with lib.maintainers; [ l0b0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix index fb86d84a9d..d18445dd20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.14.2"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "alecthomas"; repo = "voluptuous"; rev = "refs/tags/${version}"; - hash = "sha256-2a4lid9NibbvhHfs/fcyHgPRZ2HirIKuPYxMsl5oA4o="; + hash = "sha256-BM83pwgxQRCCzaGJKHGfQzDbQj/27nWes4I8Bym1nUc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index dea16f654e..7f4feb2ba9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -69,7 +69,8 @@ buildPythonPackage rec { description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project"; homepage = "https://github.com/JohnLangford/vowpal_wabbit"; license = licenses.bsd3; - broken = stdenv.isAarch64; maintainers = with maintainers; [ teh ]; + # Test again when new version is released + broken = stdenv.isLinux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix index bd6b7d7829..8730f6e0ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix index f56b9d3319..c3a3d38b98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python APIs for interacting with and managing Azure DevOps"; homepage = "https://github.com/microsoft/azure-devops-python-api"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix index d9916af506..adc385ebd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.3"; + version = "4.6.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-v8I0ovH99q5uYlnbZsQYgL9mg3n9i59W2n6/d9IiKyQ="; + hash = "sha256-mlM3fzjKwWvIfqH3LxAiRL3MgqT6RbMuAUzzEwLhlZs="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix index fa0e4ff82a..29a5e670e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-selj7XD7NS831lbPnx/4o46bNpsxuFdSEIIb4S2b7S0="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ braceexpand numpy pyyaml @@ -84,12 +84,20 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - meta = with lib; { + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # AttributeError: =16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.606.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz", - "integrity": "sha512-bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.606.0.tgz", + "integrity": "sha512-b11mAhjrkm3MMiAPoMGcmd6vsaz2120lg8rHG/NZCo9vB1K6Kc7WP+a1Q05TRMseer2egTtpWJfn44aVO97VqA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/client-sso-oidc": "3.606.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -362,11 +364,11 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.598.0.tgz", - "integrity": "sha512-u6oocRReswkA2mFlOwtCetgmEr9B+Yhle3K13x37rb1lQgq1wUuWUvHU7U9v26hUZIhfUpigV/Mgr/RQZB6+Yw==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.606.0.tgz", + "integrity": "sha512-4wGvXilFLkozs4/dMnn9NvxZbL9oyyReoF9aR3kGUZ0QVO8cCBp/Zkr8IXZifhVBo9/esJdMFnR9lEXR7Yuleg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/types": "3.598.0", "@smithy/property-provider": "^3.1.1", "@smithy/types": "^3.1.0", @@ -434,9 +436,9 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz", - "integrity": "sha512-sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==", + "version": "3.600.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.600.0.tgz", + "integrity": "sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==", "dependencies": { "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", @@ -505,18 +507,18 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.598.0.tgz", - "integrity": "sha512-IFZwH3F2rA2WbpYFUxOeu/M3/9p4+oRbKVLDZlaaDtwwuZ9VHEbnkUm20zOgSXeVExa3qgYhJvg7H5JrqxP97A==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.606.0.tgz", + "integrity": "sha512-34hswGNDWBFvp4Hi4Gv9DIJ4Ks0Nbg8w3emFsPVHLqqI6X2Wd0hJTf+mi1kMhy/AQXt5LisKLw6wjNIKD2+KGg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/client-sts": "3.598.0", - "@aws-sdk/credential-provider-cognito-identity": "3.598.0", + "@aws-sdk/client-sts": "3.606.0", + "@aws-sdk/credential-provider-cognito-identity": "3.606.0", "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/credential-provider-process": "3.598.0", "@aws-sdk/credential-provider-sso": "3.598.0", "@aws-sdk/credential-provider-web-identity": "3.598.0", @@ -1168,9 +1170,9 @@ } }, "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.10.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.1.tgz", - "integrity": "sha512-zs6LSjci2JwkEgc43nmwI4LM0fYRnJpID2tw1NJ2IlqpmW9x1dQFjv1IG401yPr+eoB+Ktzy+EezDrTKl1fMbA==", + "version": "0.10.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.2.tgz", + "integrity": "sha512-ss0c6IxhSJZwDiY18We3vjFwrCL+1HJntMInFSthJ6oM61yiCCz5m8TfUjNGJQCXhPqok7sM9RSRcKrn43u0cg==", "dependencies": { "semver": "^7.5.4" } @@ -1202,12 +1204,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.9.tgz", - "integrity": "sha512-Bc9v3cmhpfOG3LKRnOyZ/kfDJcQB1mNm7JWD2wJsaFBsWb4S1VXh50l23vC8HIj6vU6QYHGIAc5ikSxZ+shfyQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.10.tgz", + "integrity": "sha512-QvXziAmACrFty7id5I0s3ZOetIc1wWhjtpytGMtchEiusTQOO+NJy74UMrxK+NGxKPDRL0MroRIo05/LEfPkJg==", "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/i18n": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/i18n": "2.2.10", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1215,9 +1217,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.9.tgz", - "integrity": "sha512-JiS0VxGLoHNfLF9zox1dY0jX/3+ygdziigbTfS1AkKWt/Nmf/DURBFFjgLqs3mn3V3qYE4mUCmbeB9G1f6yMYA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.10.tgz", + "integrity": "sha512-ssY+WxY/oOHPZAIjrYzUYhCr1K2towzshxQpYw3nk5JyjTdvN4gc0xnrWMNLJonEOD/ADTdlneFshQhuh/V1vQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1233,12 +1235,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.9.tgz", - "integrity": "sha512-uwBtG2bQVk6N8/A7Jjl6w/FQZKIAUrrfeBA7q4kZ6XWzBY1CKcNOG1Kq5tTrN5xp82Au+FLF0rhFBy195fas0Q==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.10.tgz", + "integrity": "sha512-iLrZ1vfA67jKwEWtSKGYAZ7QM5beYFo4AsmiV+KCXwtcZref3dX1OgcjBvRW8dRvSonz8/7RnN9r8QtsTyw2xw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-api": "2.2.10", "semver": "^7.5.4" }, "engines": { @@ -1246,25 +1248,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.9.tgz", - "integrity": "sha512-9gcu2lG9d9aFT+KPRVXpgX84Ounpp0/uuBFln5XuZfKXZwoWbpWD7zJ3mBdzAQKyuZ5SR2x6NokGGZbEbLGhrA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.10.tgz", + "integrity": "sha512-fjn+GZlsChPqn2A+hWiSgxNcGxO96hPBcv2TDfnXwtMSQySPBavJoayBDbEnazRHxgbAxqpmTV4UfWPOX+jYvA==", "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/autocomplete": "2.2.9", - "@mongosh/editor": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/logging": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/service-provider-server": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/snippet-manager": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/arg-parser": "2.2.10", + "@mongosh/autocomplete": "2.2.10", + "@mongosh/editor": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/logging": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/service-provider-server": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/snippet-manager": "2.2.10", + "@mongosh/types": "2.2.10", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1297,15 +1299,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.9.tgz", - "integrity": "sha512-kTCgkeZBg1AYLKq65elwusyDiKeTyh5l4W3yg2yGvuzhk1I73DPsSkA+E2TWpqVgzsTeRXUbmySSMrKxx/t+mA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.10.tgz", + "integrity": "sha512-iYNvhBbTNXwR0Dt9bj+hwJFAWVttS2F+zl6vzvF/wcA1THddFi4A8LboWMvDtpb7YF5woHCXIW3Oc3gHOUSW/g==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/types": "2.2.10", "js-beautify": "^1.15.1" }, "engines": { @@ -1313,17 +1315,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.9.tgz", - "integrity": "sha512-gN7czs7VK1OoG6H2Cq4gVVUZZPUeBxsBBKeOOFQIGy6QH5IAr4pm/w17K5dhOEoGhdH37h3WOp3dS24z/6NF0A==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.10.tgz", + "integrity": "sha512-jR8dv9MYYRwr+Yri/KI6HAuob0zdVBQOrMvjc+ygBbTIkL3wh1iOrjZKZuYUsjei1FDxLA8NywftAoHDchq2Tg==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.9.tgz", - "integrity": "sha512-Irm8s2z48T+OMADrmJSe+xvCXMkPUCCTltGgVY3w+vm42ftfd6k3ZXGlVu+j/QNCp1D4HmRLDY6RmnQLFb2IUw==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.10.tgz", + "integrity": "sha512-EmMKvsytTXq/1tAwxZUvl+6+gCrarWdEDB9mO9vTCFneOgB0ao2jpo7KA9Jc63r8RYhDH78dtjFsSuFeox3AiA==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^0.2.3" @@ -1333,20 +1335,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.9.tgz", - "integrity": "sha512-AhEEAHV/2ytZ1swDV7VmKYt4D0P+2pqf8khR3OwOg5RJ0Cx8vRS4RdWvszxKeA26s2zlPMRiherwPTdAEc5zww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.10.tgz", + "integrity": "sha512-TxyFOhdXqCN0AXGcWziPzZ+YBf8KthnZIbOVSyA+C1a0jynfMf+XBnLnNpwvKfGZUeQ1VyZkrKLPopG7e2nuIA==", "dependencies": { - "@mongosh/errors": "2.2.9" + "@mongosh/errors": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.9.tgz", - "integrity": "sha512-YbC6nJjnR1kSOZHVD/8gx6hh8eZkkZ9r4M9NFyDTTynbKgZNCwMtFBtl10zYsNMLJOCKW6o8vJ2YFsBLdZNyww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.10.tgz", + "integrity": "sha512-c0xG7P7HjKn3ND/aK7gyADRFhXc5CogADfX6exkFlM3z5A8HVCZ0o8/x7m0oi3IIHyCvebvEatbZJ+HjdiR8UQ==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1355,9 +1357,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.9.tgz", - "integrity": "sha512-3EPqCQ64zwqR7PpdITBd3e8grpnwE7XIohuVbYXNo48Hlnz0Gdc8QAjSwQF2LO51ozCmPVcrQqCjVuLjdtPBUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.10.tgz", + "integrity": "sha512-MynI6HGlZ0kPqRfx83+9/An39laBzjlc2f6DzDIiO9FVGYcEYMScIG6e0U06M8fiarqeftprSW9dBdc1KQkeEw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1367,14 +1369,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.9.tgz", - "integrity": "sha512-/LvJ3Rk2B5Po7JkG/suZIaJybAzCUSvNGRmobwR6HeDJ4RwKMKvPUJrUYu1GXXQqdLNDXH2o9eEWojMk/IA3LQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.10.tgz", + "integrity": "sha512-0z3L23rtaASh1E2hV/wSWxDTycxktbD2XVUnSW1YbyRfePd7YOwVeUhNeFYUf1Qq2q2KeTdxgMaP5/BodY+h5A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/types": "2.2.10", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^0.2.3" }, @@ -1383,12 +1385,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.9.tgz", - "integrity": "sha512-QJ+4TBD30C3cGoKoBtGOH82RVTKNMcBG1vhs8rfRheajivMLEBka2Hk/49R6yv9lhSfwgueH57+6EFNdqVFgSQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.10.tgz", + "integrity": "sha512-XB+G24WjTIYXnHoToJhDJMwMV7pCcgCwgme0MiE6lzcYs5HwlHhk9tzBwv0+i+3NcCb5SMqU38iUMuGG6jKJdQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.9", + "@mongosh/errors": "2.2.10", "bson": "^6.7.0", "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" @@ -1401,15 +1403,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.9.tgz", - "integrity": "sha512-G4pXkwvvlnFW5sLQAbgDwqpt0tBJHlsQPJN+eMT9N6gRtEnhxAnOuOGA4zKTcaOZN2bTnzd6F7Yu5Z5AOOVXUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.10.tgz", + "integrity": "sha512-7WxxKZgXNdW7f6vUCmqqWPexPOFqy/n155rFeyWhRVBI5mdbb/Sb5vsdqo1+6AyDpCXsLdl8CldsqmOfGKG36A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/types": "2.2.10", "aws4": "^1.12.0", "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", @@ -1424,15 +1426,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.9.tgz", - "integrity": "sha512-1Wo2RJ1vpYY/LRKKyIgl9vn7nycBVpO+iAaOFRSI0VxcW7dujROIm+XLBzqvJql/0qeqfnQGXv+jCTb13emduw==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.10.tgz", + "integrity": "sha512-Cgcb0U5wqzmTmwAmMkSqhZ3fR4PjqNJ2px61i/9JzWAgIEDSbv9Xni3mcfDRQd/qjLHCEUlAPFgEBu7Cpk0qBQ==", "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", + "@mongosh/arg-parser": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", "mongodb-redact": "^0.2.3" }, "engines": { @@ -1440,27 +1442,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.9.tgz", - "integrity": "sha512-p56jKPaRfFKT4yW3FrmLeawy/8qL7x2q9Gx88e0iJhBI3ybft0dQ1tWvX3mMg6YxZGNsDeHgPSAwNlFAy3lxiQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.10.tgz", + "integrity": "sha512-9v/p5WDu+Ur7+jhXajkBOvpINcRORA1UpdMOV4sBGQ623VbmoDd7xFeFPoi0uWzV50qW5yNRlh3+dvsG/jdKmQ==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/shell-api": "2.2.9" + "@mongosh/async-rewriter2": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/shell-api": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.9.tgz", - "integrity": "sha512-JG9Svfoh1z30U7mwbojx0Wm2BkVd6wqqkkpxucgJ9ba2DG7VvgN4iez6HQa+eA3KmMKVII7IzYnt/J0gOum80g==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.10.tgz", + "integrity": "sha512-y49cANhiCZYaWjaJFLh1ByPJhNAoyZvpI9R1sbA0MC7fu2kWxd91a6mWVWI4ZZPgHGXmpGkAK0/4MpWcUGymsQ==", "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/types": "2.2.10", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1472,9 +1474,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.9.tgz", - "integrity": "sha512-Vo91tPc24nrybDsE/wQXbKynB3VC8BvF+yallZpMvLNtckr5q7nTuaTBWG5Er1myPA5MQhZm6DgpsIWR1YnGgg==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.10.tgz", + "integrity": "sha512-BfCcmbC3givNCgYZxf6aUJy+/nHg2By6Hs9gZ/WMGgiedMuL5fRE18dGlwy3Aog7Jc6tVkBCMtOpYgjVnUPoxQ==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1" }, @@ -1588,11 +1590,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.1.tgz", - "integrity": "sha512-Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz", + "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1600,14 +1602,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.2.tgz", - "integrity": "sha512-wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.4.tgz", + "integrity": "sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1615,17 +1617,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.2.2", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.2.tgz", - "integrity": "sha512-bxZr4ZTqS6hMSQGYdcsfFQTFU0MO2xKLbkqZMSRDM+ruQ0nY00lFJUeLhXe7fqohSEd1y5wKu1Ap0bVJPzpmHg==", + "version": "2.2.4", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.4.tgz", + "integrity": "sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.5", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-retry": "^3.0.7", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1633,14 +1635,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz", - "integrity": "sha512-htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.3.tgz", + "integrity": "sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1648,23 +1650,23 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.3.tgz", - "integrity": "sha512-31x2MokxJL/u5U/BdElvVRotOGjUcOOvI2pb5TZ02umBLw+vVHImiLn+khbN0SblaFXNRzPoGrKwXylNjV3skw==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.0.tgz", + "integrity": "sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.1.tgz", - "integrity": "sha512-w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.3.tgz", + "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1674,11 +1676,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz", - "integrity": "sha512-RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz", + "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1694,12 +1696,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz", - "integrity": "sha512-6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz", + "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1707,16 +1709,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz", - "integrity": "sha512-gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.4.tgz", + "integrity": "sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==", "dependencies": { - "@smithy/middleware-serde": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-middleware": "^3.0.1", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1724,17 +1726,17 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.5.tgz", - "integrity": "sha512-nKAmmea9Wm0d94obPqVgjxW2zzaNemxcTzjgd17LhGKI23D66UQKI5gpoWDsnE+R4tfuZe9dCcw8gmTVEwFpRA==", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.7.tgz", + "integrity": "sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/service-error-classification": "^3.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1743,11 +1745,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz", - "integrity": "sha512-ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz", + "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1755,11 +1757,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz", - "integrity": "sha512-fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz", + "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1767,13 +1769,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz", - "integrity": "sha512-z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.3.tgz", + "integrity": "sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1781,14 +1783,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz", - "integrity": "sha512-hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.1.tgz", + "integrity": "sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==", "dependencies": { - "@smithy/abort-controller": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/abort-controller": "^3.1.1", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1796,11 +1798,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.1.tgz", - "integrity": "sha512-YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.3.tgz", + "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1808,11 +1810,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.1.tgz", - "integrity": "sha512-eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==", + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.3.tgz", + "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1820,11 +1822,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz", - "integrity": "sha512-vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz", + "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -1833,11 +1835,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz", - "integrity": "sha512-Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz", + "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1845,22 +1847,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz", - "integrity": "sha512-ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz", + "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==", "dependencies": { - "@smithy/types": "^3.1.0" + "@smithy/types": "^3.3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz", - "integrity": "sha512-nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.3.tgz", + "integrity": "sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1868,14 +1870,14 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.0.tgz", - "integrity": "sha512-m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==", + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.2.tgz", + "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1885,15 +1887,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.3.tgz", - "integrity": "sha512-YVz+akpR5lIIRPJfhE4sqoHYwMys6/33vsFvDof+71FCwa4jkVfMpzKv9TKrG/EDb5TV+YtjdXkwywdqlUOQXA==", + "version": "3.1.5", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.5.tgz", + "integrity": "sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==", "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "@smithy/util-stream": "^3.0.3", + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.0.5", "tslib": "^2.6.2" }, "engines": { @@ -1901,9 +1903,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.1.0.tgz", - "integrity": "sha512-qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==", + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.3.0.tgz", + "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==", "dependencies": { "tslib": "^2.6.2" }, @@ -1912,12 +1914,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.1.tgz", - "integrity": "sha512-G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.3.tgz", + "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==", "dependencies": { - "@smithy/querystring-parser": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/querystring-parser": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1977,13 +1979,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.5.tgz", - "integrity": "sha512-VZkJ+bXCHcNSMhX8EReGyFcc/Err94YGqeEKbbxkVz2TgKlacsoplpi+kxOMVbQq/tq9sQx5ajBKG+nl2GNuxw==", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.7.tgz", + "integrity": "sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -1992,16 +1994,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.5.tgz", - "integrity": "sha512-jy19cFQA0k4f8VUDFsZVBey3rmI8EuXCw/xh/abdiq6S1qdwdfZ5coviuyYd//LPszf2yWIYkLpvmLF9qbhLGg==", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.7.tgz", + "integrity": "sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==", "dependencies": { - "@smithy/config-resolver": "^3.0.2", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "@smithy/config-resolver": "^3.0.4", + "@smithy/credential-provider-imds": "^3.1.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2009,12 +2011,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz", - "integrity": "sha512-4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==", + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.4.tgz", + "integrity": "sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2033,11 +2035,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.1.tgz", - "integrity": "sha512-WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz", + "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2045,12 +2047,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.1.tgz", - "integrity": "sha512-5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.3.tgz", + "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==", "dependencies": { - "@smithy/service-error-classification": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2058,13 +2060,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.3.tgz", - "integrity": "sha512-ztOvXkXKJromRHNzvrLEW/vvTQPnxPBRHA0gR0QX61LnHDgrm4TBT4EQNpWwwHCD1N0nnEL5bEkzo2dt2t34Kg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.5.tgz", + "integrity": "sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==", "dependencies": { - "@smithy/fetch-http-handler": "^3.0.3", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/fetch-http-handler": "^3.2.0", + "@smithy/node-http-handler": "^3.1.1", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2480,9 +2482,9 @@ } }, "node_modules/bson": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/bson/-/bson-6.7.0.tgz", - "integrity": "sha512-w2IquM5mYzYZv6rs3uN2DZTOBe2a0zXLj53TGDqwF4l6Sz/XsISrisXOJihArF9+BZ6Cq/GjVht7Sjfmri7ytQ==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/bson/-/bson-6.8.0.tgz", + "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", "engines": { "node": ">=16.20.1" } @@ -2551,9 +2553,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001636", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", - "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", + "version": "1.0.30001638", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", + "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", "funding": [ { "type": "opencollective", @@ -2860,9 +2862,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.805", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz", - "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==" + "version": "1.4.815", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", + "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3451,14 +3453,15 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.2", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "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": { @@ -3472,9 +3475,9 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3615,9 +3618,9 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.4", - "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", - "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "version": "7.0.5", + "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -3810,9 +3813,9 @@ } }, "node_modules/joi": { - "version": "17.13.1", - "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.1.tgz", - "integrity": "sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==", + "version": "17.13.3", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.3.tgz", + "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", "dependencies": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", @@ -3822,9 +3825,9 @@ } }, "node_modules/jose": { - "version": "4.15.5", - "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.5.tgz", - "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", + "version": "4.15.7", + "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.7.tgz", + "integrity": "sha512-L7ioP+JAuZe8v+T5+zVI9Tx8LtU8BL7NxkyDFVMv+Qr3JW0jSoYDedLtodaXwfqMpeCyx4WXFNyu9tJt4WvC1A==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -4138,9 +4141,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.7.0.tgz", - "integrity": "sha512-TMKyHdtMcO0fYBNORiYdmM25ijsHs+Njs963r4Tro4OQZzqYigAzYQouwWRg4OIaiLRUEGUh/1UAcH5lxdSLIA==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.8.0.tgz", + "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -4421,9 +4424,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4531,18 +4537,18 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "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.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" }, "engines": { "node": ">= 14" @@ -4560,6 +4566,11 @@ "node": ">= 14" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", @@ -4592,9 +4603,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "10.3.0", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.3.0.tgz", + "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==", "engines": { "node": "14 || >=16.14" } @@ -5183,13 +5194,13 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", + "version": "8.0.4", + "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json index cdebe929bf..d9e301c949 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.9", - "integrity": "sha512-7zROoz9tFqBW3t4aI6pO9S6GmGuDWb9m8hT0w91uL6CXTHUcYH7XM4INR2jr3+qXFYLkaXZ1WQoLgmuoJoSj7g==", - "filename": "mongosh-2.2.9.tgz", - "deps": "sha256-wefY8JDdtabrtlJfsT4iZsCwYIbIxv8T+U2S29Hl2O4=" + "version": "2.2.10", + "integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==", + "filename": "mongosh-2.2.10.tgz", + "deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix index 8331ecde3e..6249685b50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.3.65"; + version = "0.3.66"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QhWoCEoM04/MlUgCFCeAR7kF6QSg0joz/i9ZbXRQtDs="; + sha256 = "sha256-Gh4bhJh5ZB2ZEp3cx1D/r1qyc5SLdQ7RGGR12UaFW/k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 6c2d5175c3..06161d95c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-nf/xQ5744cplTNYkwaUbGv7Dw0BGf52dWTjnTVa9qL8="; + hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index f622e11b14..2fe91c46bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-FcrymV0n/Bv0cS9Dx6sG+ifilBiPfaG+xpQvH9mvylQ="; + sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix index 10131c23b2..9b31a5ab54 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "4.2.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-tWV7HnIeTao3IbT2xxsu+//4aLQLKP/+ySqrvzU139c="; + hash = "sha256-yMFz3KrB1eIzGg0LB3U0H+XQz/DKhJOyiG8ScW9Lm7A="; }; outputs = [ "out" "bin" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix index 83972abf8b..eb8b847960 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -1,17 +1,17 @@ { + lib, stdenvNoCC, - fetchurl, callPackage, jq, moreutils, cacert, makeSetupHook, pnpm, + yq, }: { fetchDeps = { - src, hash ? "", pname, ... @@ -36,15 +36,22 @@ name = "${pname}-pnpm-deps"; nativeBuildInputs = [ + cacert jq moreutils pnpm - cacert + yq ]; installPhase = '' runHook preInstall + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi + export HOME=$(mktemp -d) pnpm config set store-dir $out # Some packages produce platform dependent outputs. We do not want to cache those in the global store diff --git a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix index 6fecadca5e..a9252814d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.49.8"; + version = "0.50.1"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-x4xjFXpyuZRBcE6I+s3GCJmTg/nm9lHHnXNAKOFA5RQ="; + hash = "sha256-zn9bxOWJWlF3lpVAuJQTTnBqNeTAZg+0bPVGAzf3a54="; }; - vendorHash = "sha256-xHBiY2SHprGxmjaNqHPUMc0oa4iQ9L3X8ydvEiG5om4="; + vendorHash = "sha256-E3pzeu+JA97z2q21ARTgwTPldhWODqkCP7rQMMKygAw="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix index 9f761ef0be..57485de36f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; + hash = "sha256-ujbJrF7QDd2DIsZGEoJrM3VA2WNpkJNe4BZVcPokXRg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index c9e219f82b..100aba324d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -1,23 +1,23 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security }: +, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.9.0"; + version = "3.9.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-eMbeU9DflGXQRqoXnTlMmCJUsCvAywjmckDqxhT+LD8="; + hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8="; }; - cargoHash = "sha256-rYHvvGyD49+n7DHHd0CKCwd6w5WgWONWGxW2vXm7DL4="; + cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix index a11f60bf99..4610cf9326 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.17.00"; + version = "2024.06.24.00"; src = fetchFromGitHub { owner = "facebookincubator"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J3ZrlX83TE63Go4qp+lMhexkuaV0ZgHNYga8qxZF0wI="; }; - cargoHash = "sha256-xqDMfGNvlyFo3v9GmESfRG+WyQKbzTojOqtYK/tMPxo="; + cargoHash = "sha256-oPo5fmf45FJEoeAXQSZ4+uhKN4CSwhe8AbdPV4ehGd4="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix index c62211d697..96d938ad20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix @@ -7,6 +7,7 @@ , fontconfig , freetype , glib +, libdrm , libGLU , libglvnd , libICE @@ -21,15 +22,15 @@ }: let - buildNum = "2023-12-04-1282"; + buildNum = "2024-04-18-1396"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-gGkINq0tmOCkZJMxtoURHikqEGXGuRAP6Y6PEOLqmI0="; + hash = "sha256-mP5tmq252IsWYVRGNKVib8ZbM5M4srUKXJ3x2ff4YhM="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -39,6 +40,7 @@ stdenv.mkDerivation { fontconfig freetype glib + libdrm libGLU libglvnd libICE diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch new file mode 100644 index 0000000000..6c46ebb060 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch @@ -0,0 +1,21 @@ +diff --git i/librubyfmt/build.rs w/librubyfmt/build.rs +index 296b749..941a4ca 100644 +--- i/librubyfmt/build.rs ++++ w/librubyfmt/build.rs +@@ -166,6 +166,7 @@ fn run_configure(ruby_checkout_path: &Path) -> Output { + command + .arg("--target=aarch64-unknown-linux-gnu") + .arg("--host=x86_64") ++ .arg("--disable-werror") + .env("CC", "aarch64-linux-gnu-gcc") + .env("AR", "aarch64-linux-gnu-ar") + .env("RANLIB", "aarch64-linux-gnu-ranlib"); +diff --git i/librubyfmt/src/lib.rs w/librubyfmt/src/lib.rs +index 9b94b5f..b78e99f 100644 +--- i/librubyfmt/src/lib.rs ++++ w/librubyfmt/src/lib.rs +@@ -1,4 +1,3 @@ +-#![deny(warnings, missing_copy_implementations)] + #![allow(clippy::upper_case_acronyms, clippy::enum_variant_names)] + + use serde::de::value; \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix index 272fe25a5b..287959dbf0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix @@ -61,6 +61,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ # Avoid checking whether ruby gitsubmodule is up-to-date. ./0002-remove-dependency-on-git.patch + # Avoid failing on unused variable warnings. + ./0003-ignore-warnings.patch ]; cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; @@ -71,17 +73,12 @@ rustPlatform.buildRustPackage rec { mv $out/bin/rubyfmt{-main,} ''; - meta = with lib; { + meta = { description = "Ruby autoformatter"; homepage = "https://github.com/fables-tales/rubyfmt"; - license = licenses.mit; - maintainers = with maintainers; [ bobvanderlinden ]; - # https://github.com/NixOS/nixpkgs/issues/320722 - broken = true - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) - || stdenv.isDarwin && stdenv.isx86_64; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + broken = stdenv.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index 50eb514626..2599d963d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-KF8fdUfAXfSLIzt9+7sgbrDgKe+6478eXCGFxxX/WC0="; + hash = "sha256-2P+AS4/nNZ9bYzpJSinw7xJb+RuUbnxvX+wxPvV1BKw="; }; - cargoHash = "sha256-jrHcr/YsMTEk+X1/puausYI75Ozqdi8hol7sRFUJkPU="; + cargoHash = "sha256-205TOqFp/LwCapH9ClgFrMLA+VSV2P0jDdPTo0ku87M="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index 4d2fcecfc5..6509fa381c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.35.1"; + version = "0.36.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Jz4sdf/Heh0+rnz2JP5TJFqRPCdi1Km+PSoafkmq/6Y="; + hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA="; }; - cargoHash = "sha256-K45PT28cxYWn7lF/ghhgCXcLA9uZUiI+3WMYeU3bbzM="; + cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix index 24b64c0cdf..1278a60cf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.36"; + version = "0.2.37"; src = fetchCrate { inherit pname version; - hash = "sha256-Ptv8txt7YXPh1QvFwsoRbBQgeLBGn6iVqst1GHU+JJw="; + hash = "sha256-doN4oL7ZRuORgVsPFMY57zRFwz4m2BqgEgNvnf4t5cU="; }; - cargoHash = "sha256-GkhFbRhEJ+7ikqkNPydKx3Ty8KRsGts5UnwA8bl8Po8="; + cargoHash = "sha256-QWMsDUBJZgXXd20FYDpJYXxofhT7YohTV0hiHePww1o="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index 7b1613cfd7..6a41db928f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.46"; + version = "1.0.47"; src = fetchCrate { inherit pname version; - hash = "sha256-wQo9HDVb7m+FdrMnNVAESEK3k3wrsZYvVpIMu2YNhS8="; + hash = "sha256-G52Nr+Cc6h/26T0HxQ691PRgHUUC2TuoRstNdibGJ1Q="; }; - cargoHash = "sha256-tj9bbT7UlsVbEibtomB7rFK/V6Jdo5K0uoeuXw1yq+o="; + cargoHash = "sha256-WFh7bfkcDMBkowP4YsMxy95PXYKhA4uVW4MYyT22E0o="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4ffd90ca1f..d4ba928a10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.18.4"; + version = "0.19.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-J9R/cT58wjvDcS5AKhGtbxbFYiNGFBmrLtIF2CfTIaE="; + hash = "sha256-1WTV6XqV9Y7d6WlH7rBb0Lfki6ftf+3z/azqQwzcOts="; }; - cargoHash = "sha256-F9QOlYpKAQx7xF6yyGa/tOkziEyXCg5LW6gH0X6uXRc="; + cargoHash = "sha256-Msi3V8mVnz9AqXdci79N9cbCouOyvVI4NdUAFP2IEsg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix deleted file mode 100644 index a32a76aeb8..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper - -, cargo -, nix -, nix-prefetch-git -}: - -rustPlatform.buildRustPackage rec { - pname = "crate2nix"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = version; - hash = "sha256-rGT3CW64cJS9nlnWPFWSc1iEa3dNZecVVuPVGzcsHe8="; - }; - - sourceRoot = "${src.name}/crate2nix"; - - cargoHash = "sha256-YoE6wrQNQcRo/yaiVpASU2VOmHCPM4pDgTejn0ovOVY="; - - nativeBuildInputs = [ makeWrapper ]; - - # Tests use nix(1), which tries (and fails) to set up /nix/var inside the - # sandbox - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/crate2nix \ - --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} - - rm -rf $out/lib $out/bin/crate2nix.d - mkdir -p \ - $out/share/bash-completion/completions \ - $out/share/zsh/vendor-completions - $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions - $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions - ''; - - meta = with lib; { - description = "Nix build file generator for Rust crates"; - mainProgram = "crate2nix"; - longDescription = '' - Crate2nix generates Nix files from Cargo.toml/lock files - so that you can build every crate individually in a Nix sandbox. - ''; - homepage = "https://github.com/nix-community/crate2nix"; - license = licenses.asl20; - maintainers = with maintainers; [ kolloch cole-h ]; - platforms = platforms.all; - }; -} - diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 941460c35d..6443cae2f5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-11"; - cargoSha256 = "sha256-mo3TGaUI1gjJX64Di7+M40CzHkIuFAuXl27yJ9GPkPU="; + version = "2024-06-24"; + cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/N0sZW3xiivMm5klk9zBtzMlO+uaxnUq35kI3bakLx8="; + sha256 = "sha256-jzZRTQjXhiwEdzo/SlxP72BUa7g0LVr7MEsaR7A/geg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 963e134075..49be63a2b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -9,20 +9,33 @@ runCommand "test-neovim-rust-analyzer" { } ''; + # NB. Wait for server done type calculations before sending `hover` request, + # otherwise it would return `{unknown}`. + # Ref: https://github.com/rust-lang/rust-analyzer/blob/7b11fdeb681c12002861b9804a388efde81c9647/docs/dev/lsp-extensions.md#server-status nvimConfig = /* lua */ '' + local caps = vim.lsp.protocol.make_client_capabilities() + caps["experimental"] = { serverStatusNotification = true } vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({ cmd = { "rust-analyzer" }, + capabilities = caps, handlers = { - ["$/progress"] = function(_, msg, ctx) - if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then - vim.cmd("goto 23") -- let mut |var =... - vim.lsp.buf.hover() + ["experimental/serverStatus"] = function(_, msg, ctx) + if msg.health == "ok" then + if msg.quiescent then + vim.cmd("goto 23") -- let mut |var =... + vim.lsp.buf.hover() + end + else + print("error: server status is not ok: ") + vim.cmd("q") end end, ["textDocument/hover"] = function(_, msg, ctx) - -- Keep newlines. - io.write(msg.contents.value) - vim.cmd("q") + if msg then + -- Keep newlines. + io.write(msg.contents.value) + vim.cmd("q") + end end, }, on_error = function(code) diff --git a/third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix b/third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix index 0d4ffad569..11a0c0fa77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.21.2"; + version = "16.21.4"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-M8kHJOkbxJGpZWOZ1asGYPM76ZWSpkaYIAfWsaisXLs="; + hash = "sha256-8/Wf5RfR8Tb32VyBhHPAtbiqQN1LsnOxy98MWNPkWrM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix index 6d551fa734..e239483e4a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-13zPRp5lzUkQEcNpME1M8VMON0mq7VMQ90WL24fzcaI="; + hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk="; }; - cargoHash = "sha256-7agdxuEVLZg1uTKyrtPnLdzMHlvdY41/w6QCDj7TC2E="; + cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 7fe099fd69..093be6c4bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.95.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-9QrDtqF9A3UhStKtwkq/FCULoJQz+RjS7yEolZbBLCw="; + hash = "sha256-SgUlGzQy+K+GhrbZR/lnKyLsI5cjXxBu/SpNqlfe5IA="; }; - vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ="; + vendorHash = "sha256-Za8njJ0aExZe2LmQe6q9Q0Phjo1ot3bYK/zGNzyi7fo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index fe0544b671..a37c79b34f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.21.0"; + version = "5.21.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4="; + hash = "sha256-0hriMtxmqjQrR/gAdOk8RfyPQp2ZYCdyt/sMTUqC1/4="; }; buildInputs = [ nodejs-slim ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index b70e844871..cff5a27f87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.7"; + version = "1.22.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-417z9N8oC0kIqBs63fP/xdry5EFmlnyWDryKaJITtZQ="; + hash = "sha256-FD9Sn1NwiahrYv99avwC2wtoTlwnqiuE7dCNPsD0+y4="; }; - cargoHash = "sha256-Ol/pk3/9StHzEFHXcsSS9APUXf8hjnY7fwmF1mWtsVE="; + cargoHash = "sha256-NmF2pBru3iCOfl5q3Td9HBxi9VGmilUK3q3JckUeu/o="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index 9a158be022..8988424d77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "wails"; - version = "2.8.2"; + version = "2.9.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-oJ/kxYphBTXxt7Da1x4GW/a78YV+m32iC/4N3MDjU/A="; + hash = "sha256-dtfFeNK7ZfqriK4S0/+Wor1hUJv5kgnRWURVqt+RrNU="; } + "/v2"; vendorHash = "sha256-15Vo4AKmd9qOF0ea1klTlrXJOUs+IHvsNT2rw4R7ZiU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix index 89132f4c83..0287fd6f8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix @@ -1,19 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: buildGoModule rec { pname = "yamlfmt"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VAXDkD4JLoiTomCNtuex/ZEAZtWDEEg5cxETYemvQW8="; + hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; }; vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; - doCheck = false; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + passthru.tests.version = testers.testVersion { + package = yamlfmt; + }; meta = with lib; { description = "Extensible command line tool or library to format yaml files"; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix index 4b1ff6de26..954fc03b00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.2.2"; + version = "4.3.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-dOWcfeWotWgx1ctY/TEuxH1gkgp9Gxou6jaymJMBHLE="; + hash = "sha256-aV86k5gjHIbd09YDwC6aHA1tPl+p9Lt0cYVVvtNTDlY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix index d194b576c3..f408780d1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XY8vLCflNgxM75cTaUaqJPg8ZIm5dealC6K8es/5F5Q="; + sha256 = "sha256-xjE/9Sl4lpgUg1+giUw/14E3MehhFqJI5cYXaw/qVPE="; }; vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; diff --git a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix index 3839da048f..50db729bca 100644 --- a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-bhtzz6eyvEXrGrp7upvk6hYuOeiOjI+sxXQy+9gyBto="; + sha256 = "sha256-t75lmprCWumwt1wNVNWZSHdk1NBSmFqwjDQZHRpBv9g="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 4fa21673a6..0bbaf69a73 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.15"; + version = "1.1.17"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -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-T6V3B54rpdNmF60lX137Pau80+E/21aSl6LCa+6GHq4="; + hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-ekWcoZxGsq1AtBLflzzhVQ2lVPwQt61Y86MVHtFJsUQ="; + hash = "sha256-eytY45LcgeI9m9amHd8hfE7Lz7ET7p19h37Bi4yUHBM="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-o1NWjuWTwIQamLG10UU7LawZ9jB8RDuLWJKbCCEIdeU="; + hash = "sha256-bF/yg7C2tsdPjotC4DKISZRWEUUmUha22tWJynearEM="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-PLGR7TEdy3sQ3S9rKWe8z8gjrmb8STyYPzbRPaJYSPI="; + hash = "sha256-pRggu/l0HgCk73kX7W43qKFVE13/7pP4P9bTiqyK2Yk="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index e044214211..a635dd9133 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.72"; + version = "0.2.75"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw="; + hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws="; }; - vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; + vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule rec { patches = [ ./disable-auto-update.patch ]; preBuild = '' - go generate ./... + GOOS= GOARCH= CGO_ENABLED=0 go generate ./... ''; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 232f6dffaa..4df54b13a1 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.20.16"; + version = "2.20.34"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-0RiSNRoRmN7X2udwgGaArXgIRTaxaGH4fo3usiCJNbA="; + hash = "sha256-x6xeAFy96Ur+Kc1ODQxpX/lgK2CJWn34HgZzGSmcwqE="; }; - vendorHash = "sha256-8OEF2sAJZuGX4z/OsXCAkRR82JO3rYCEJQbidIjGOJ8="; + vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/games/antsimulator/default.nix b/third_party/nixpkgs/pkgs/games/antsimulator/default.nix index 69cd7ad189..637c53d1b3 100644 --- a/third_party/nixpkgs/pkgs/games/antsimulator/default.nix +++ b/third_party/nixpkgs/pkgs/games/antsimulator/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Simple Ants simulator"; mainProgram = "antsimulator"; license = licenses.mit; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix index 79757acef9..817ce111d0 100644 --- a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix +++ b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "chiaki4deck"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-gh+ZOsAOi5mKZjs7B1xh07vatoD8F2j2HVxOT/fKDEo="; + hash = "sha256-NiShxa49ZKmK/3q8+PHwy7edwjaqtkOqfhd2ncWK5UQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix index 84ecbf4e91..955baea28b 100644 --- a/third_party/nixpkgs/pkgs/games/ddnet/default.nix +++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cargo , cmake , ninja @@ -35,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.1"; + version = "18.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-kAMKeYYMCFMgG3+G/05DwA3mj4JkJdrXadjFUMPDAbM="; + hash = "sha256-QefbA6ncxMDHmd7tBH1bU+8FoVVJVdEtOuVXEvteSOE="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-8mUo2I5FsA3ym/hrlGaUW8yltLuh/0H6wetCbzvRga0="; + hash = "sha256-XwSdDvE0p/A+6ZbV82K78jgIxGs71fu7ZDGTl0I0cCI="; }; nativeBuildInputs = [ @@ -91,6 +92,13 @@ stdenv.mkDerivation rec { Security ]); + patches = [ + (fetchpatch { + url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; + hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; + }) + ]; + postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 52560a0d52..845aae0815 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { mainProgram = "dwarftherapist"; description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; + maintainers = with maintainers; [ abbradar bendlas numinit ]; license = licenses.mit; platforms = platforms.x86; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index 627b2349c8..f17e09a7ff 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "13.0i"; + version = "13.0o"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-jXiZ/+XvDluXvNFmSp4suAFVsQvbHEx6fa4iztu+n6c="; + sha256 = "sha256-a7Ykm+Z7MXfO+eZJjZ+TMuOe6Q+QmjOwcMORI9bZGeM="; }; CXXFLAGS = [ diff --git a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix deleted file mode 100644 index a03a05bcb3..0000000000 --- a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, boost -, liboauth -, jsoncpp -, htmlcxx -, rhash -, tinyxml-2 -, help2man -, wrapQtAppsHook -, qtbase -, qtwebengine -, testers -, lgogdownloader - -, enableGui ? true -}: - -stdenv.mkDerivation rec { - pname = "lgogdownloader"; - version = "3.12"; - - src = fetchFromGitHub { - owner = "Sude-"; - repo = "lgogdownloader"; - rev = "v${version}"; - hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - help2man - ] ++ lib.optional enableGui wrapQtAppsHook; - - buildInputs = [ - boost - curl - htmlcxx - jsoncpp - liboauth - rhash - tinyxml-2 - ] ++ lib.optionals enableGui [ - qtbase - qtwebengine - ]; - - cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; - - passthru.tests = { - version = testers.testVersion { package = lgogdownloader; }; - }; - - meta = with lib; { - description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; - mainProgram = "lgogdownloader"; - homepage = "https://github.com/Sude-/lgogdownloader"; - license = licenses.wtfpl; - maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index 49ce37cc4b..8489d32a8e 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems @@ -82,6 +83,19 @@ let patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch + # Fix build with gradle 8.8, remove on next Arc release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch"; + hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg="; + extraPrefix = "Arc/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch"; + hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ="; + extraPrefix = "Arc/"; + stripLen = 1; + }) ]; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index ff6a59e08a..070cf908fa 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -130,7 +130,8 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.updateScript = gitUpdater { - ignoredVersions = "^[^.]+$|.*-android$"; + allowedVersions = "\\."; + ignoredVersions = "-android$"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix b/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix index 83c7f8b5c9..66a2079282 100644 --- a/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix +++ b/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, makeDesktopItem -, copyDesktopItems -, testers -, opensupaplex -, SDL2 -, SDL2_mixer +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + makeDesktopItem, + copyDesktopItems, + testers, + opensupaplex, + SDL2, + SDL2_mixer, }: let @@ -68,22 +69,27 @@ stdenv.mkDerivation rec { version = "v${version}"; }; - desktopItems = [(makeDesktopItem { - name = "opensupaplex"; - exec = meta.mainProgram; - icon = "open-supaplex"; - desktopName = "OpenSupaplex"; - comment = meta.description; - categories = [ "Application" "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + name = "opensupaplex"; + exec = meta.mainProgram; + icon = "open-supaplex"; + desktopName = "OpenSupaplex"; + comment = meta.description; + categories = [ + "Application" + "Game" + ]; + }) + ]; - meta = with lib; { + meta = { description = "A decompilation of Supaplex in C and SDL"; homepage = "https://github.com/sergiou87/open-supaplex"; changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt"; - license = licenses.gpl3Only; - maintainers = [ maintainers.ivar ]; - platforms = platforms.linux; # Many more are supported upstream, but only linux is tested. + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = lib.platforms.linux; # Many more are supported upstream, but only linux is tested. mainProgram = "opensupaplex"; }; } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix index ee8a20a865..a6081ca2c3 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.521.2"; + version = "2024.625.2"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-YaCET5njEkjWEON3hDUwQ1vg7//7fiJ+5bDRKPRR6M0="; + hash = "sha256-gWtWgmH3CaaeTv4mX3edE+OjYehdiaQ8sx2k8gSAMlw="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-M7fPOEcdOsPnrbyyh4JAiQnoffDK5Ba6lejtHwcqifM="; + hash = "sha256-dWxBjLqzX8c3FLBGlmhcXB+CO7sLlcrDvpzc2Hvu7Uo="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-QVDgY04PmGJ/eOfes/qBAbBKsk9uOaqLjwZSQH+F9ro="; + hash = "sha256-YAXcnQKSvVDBfhHFkfKCeSwdpsHHOTmLHIKcOSHjq1E="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 67454d30a6..45c599c8db 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.521.2"; + version = "2024.625.2"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-g/d+3389EDh2uDq+Zqvh87AioZ2s3IFBE4bhEy6NT1s="; + hash = "sha256-eeXsz8TU8YcFgG6pYhh013rN2S4L5RdzF+VNJ5hsS34="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 8e7a5c6d2e..df63575889 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -61,7 +61,7 @@ (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 = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; sha256 = "1cq7lj88r0nwypr157nd99g3wzk00wjinx84vasbga77kfcf4z9n"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) @@ -137,16 +137,18 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.329.0"; sha256 = "1hpcgga80sliip6r1a7ps1bb2cwqfrg34sj2y473ijxbhk74swhr"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.625.0"; sha256 = "0yqb0v98s880nldgrdgpx48g4217x1jdihrvzsiapmn4h9dcdxmd"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; sha256 = "14vx8gz249nr9zx0qqcd4lrz8nxddclki3mjf0xvc1pfkz7xnqdj"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.517.0"; sha256 = "18jsxlp73ij4snns4dm95a31lynzvfrknk4nhhzldw8h3kfgb0ky"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.622.0"; sha256 = "08hrvqq68xvbdr6xj1gp2sgd5qc4hq1jsm5ygp06b05nc3qfhqbz"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; sha256 = "158h05lbw6m5anv8glsaylbrc4mbxm8m314cicrga815hcrgxmdi"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.9-ga61b647961"; sha256 = "1avi372bff89xzb4awbv96q479xknlxhwxnl0i2aylv7gz11yjad"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.9-ga61b647961"; sha256 = "0czgzsb46gbndcp3xjnvy5x22j2ljicljcgyzkrf9j8f1hxr5bzn"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.9-ga61b647961"; sha256 = "0ksdhzn2ff5qldzv1yrc0gprjflzh9zqdrgfddjll4786g9qglgs"; }) + (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.528.0"; sha256 = "16784z05bxcbzlhzjw07c6ksgllp048cif9fy6nqyc7kb9bxk39z"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; sha256 = "1y2cbqxhm919mf6cv1q2g18yjfcpc09rjxqxjkl06pb98bf43xpr"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; sha256 = "07m3zlcgdkc8nmwrz9b75jkrmgaaxwpmm1w8ha1cli81v9jwps05"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; sha256 = "1q6i5nl7b6yyfyz56n9mj096lir9nlals8kbn6wl9cwnffjbymkz"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) + (fetchNuGet { pname = "ppy.Vk"; version = "1.0.26"; sha256 = "1wf6rqlz6n7mkh639lq1hca3pqypmzl9crbvqdnngb2f33qr83v0"; }) (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) @@ -198,7 +200,7 @@ (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.3"; sha256 = "0f36my2lzkgc5fvk6s0lh4gn15vxhbl2zg71rdql7vrzh8b77c6q"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; sha256 = "0cs6wfx74rwp88m5arci04ldv2s92kpif28ykfm9ig17h9a8gsnc"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.8"; sha256 = "0m5jhil1h0z9x9j38x0k4053s065z28bsdgy3fxa85d4b5898shw"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; sha256 = "1j67fs6qznkcsfnf2z2571vks1c0bhg4nzcbh8i286rz77hk9gcg"; }) @@ -318,7 +320,6 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) - (fetchNuGet { pname = "Vk"; version = "1.0.25"; sha256 = "18kx3g088215803yznnmf6621wgwvgakj8hlmrb726b7zwb3x53l"; }) (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; sha256 = "07wdz77cb4c0f4bzzkd7fzkfl5jx6m6mnddpxgab8a95ryv60xrd"; }) (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; sha256 = "18zyx9srbszah9hk8fkc1iws0hb5137gd77xi0qq9gx1nb62lkl5"; }) (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; sha256 = "11yjyvyz922z1ygl8gxmdym3918df12nl7xxry4pdjpl8is33qic"; }) diff --git a/third_party/nixpkgs/pkgs/games/papermc/derivation.nix b/third_party/nixpkgs/pkgs/games/papermc/derivation.nix index 50796407c2..299248a64d 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/derivation.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/derivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash }: +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash, udev }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; @@ -21,7 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D $src $out/share/papermc/papermc.jar makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ - --append-flags "-jar $out/share/papermc/papermc.jar nogui" + --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/games/papermc/versions.json b/third_party/nixpkgs/pkgs/games/papermc/versions.json index 67fb3903da..47732fd05b 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/versions.json +++ b/third_party/nixpkgs/pkgs/games/papermc/versions.json @@ -56,7 +56,7 @@ "version": "1.20.6-147" }, "1.21": { - "hash": "sha256-LaQyYAlZ2GQKzT3GlOKr1RUhu0XQpILuqPcDHdczqcU=", - "version": "1.21-15" + "hash": "sha256-Anh09jDs+peSU79+jtETFMADt5N3K82QNwru7U0nyHU=", + "version": "1.21-37" } } diff --git a/third_party/nixpkgs/pkgs/games/principia/default.nix b/third_party/nixpkgs/pkgs/games/principia/default.nix index 0cf659e448..ba163c0f99 100644 --- a/third_party/nixpkgs/pkgs/games/principia/default.nix +++ b/third_party/nixpkgs/pkgs/games/principia/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "principia"; - version = "2024.02.29"; + version = "2024.06.28"; src = fetchFromGitHub { owner = "Bithack"; repo = "principia"; rev = finalAttrs.version; - hash = "sha256-L37H261IGCcH2K7RhX8iTdHRkle83vKhgpyssRmSKN0="; + hash = "sha256-S7p/Jcpp42vsdKGFgxLb2IeePB0ktKuMQLJzvXyZilg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix deleted file mode 100644 index b9b585a4e5..0000000000 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, stripJavaArchivesHook -, cmake -, cmark -, Cocoa -, ninja -, jdk17 -, zlib -, qtbase -, quazip -, extra-cmake-modules -, tomlplusplus -, ghc_filesystem -, gamemode -, msaClientID ? null -, gamemodeSupport ? stdenv.isLinux -, -}: -let - libnbtplusplus = fetchFromGitHub { - owner = "PrismLauncher"; - repo = "libnbtplusplus"; - rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; - hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; - }; -in - -assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; - -stdenv.mkDerivation (finalAttrs: { - pname = "prismlauncher-unwrapped"; - version = "8.3"; - - src = fetchFromGitHub { - owner = "PrismLauncher"; - repo = "PrismLauncher"; - rev = finalAttrs.version; - hash = "sha256-1YGzCgNdzscnOVeNlHMFJa0RbMo6C2qQjtBOeDxHakI="; - }; - - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja stripJavaArchivesHook ]; - buildInputs = - [ - qtbase - zlib - quazip - ghc_filesystem - tomlplusplus - cmark - ] - ++ lib.optional gamemodeSupport gamemode - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; - - cmakeFlags = [ - # downstream branding - "-DLauncher_BUILD_PLATFORM=nixpkgs" - ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] - ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] - ++ lib.optionals stdenv.isDarwin [ - "-DINSTALL_BUNDLE=nodeps" - "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/Applications/" - ]; - - postUnpack = '' - rm -rf source/libraries/libnbtplusplus - ln -s ${libnbtplusplus} source/libraries/libnbtplusplus - ''; - - dontWrapQtApps = true; - - meta = { - mainProgram = "prismlauncher"; - homepage = "https://prismlauncher.org/"; - description = "Free, open source launcher for Minecraft"; - longDescription = '' - Allows you to have multiple, separate instances of Minecraft (each with - their own mods, texture packs, saves, etc) and helps you manage them and - their associated options with a simple interface. - ''; - platforms = with lib.platforms; linux ++ darwin; - changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ minion3665 Scrumplex getchoo ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix deleted file mode 100644 index f5b21d7084..0000000000 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ lib -, stdenv -, symlinkJoin -, makeWrapper -, wrapQtAppsHook -, addOpenGLRunpath - -, prismlauncher-unwrapped - -, qtbase # needed for wrapQtAppsHook -, qtsvg -, qtwayland -, xorg -, libpulseaudio -, libGL -, glfw -, glfw-wayland-minecraft -, openal -, jdk8 -, jdk17 -, jdk21 -, gamemode -, flite -, glxinfo -, pciutils -, udev -, vulkan-loader -, libusb1 - -, msaClientID ? null -, gamemodeSupport ? stdenv.isLinux -, textToSpeechSupport ? stdenv.isLinux -, controllerSupport ? 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 - -, jdks ? [ jdk21 jdk17 jdk8 ] -, additionalLibs ? [ ] -, additionalPrograms ? [ ] -}: - -assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux"; - -let - prismlauncher' = prismlauncher-unwrapped.override { - inherit msaClientID gamemodeSupport; - }; -in - -symlinkJoin { - name = "prismlauncher-${prismlauncher'.version}"; - - paths = [ prismlauncher' ]; - - nativeBuildInputs = [ - wrapQtAppsHook - ] - # purposefully using a shell wrapper here for variable expansion - # see https://github.com/NixOS/nixpkgs/issues/172583 - ++ lib.optional withWaylandGLFW makeWrapper; - - buildInputs = [ - qtbase - qtsvg - ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; - - 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 - ''; - - qtWrapperArgs = - let - runtimeLibs = [ - xorg.libX11 - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXxf86vm - - # lwjgl - libpulseaudio - libGL - glfw - openal - stdenv.cc.cc.lib - vulkan-loader # VulkanMod's lwjgl - - # oshi - udev - ] - ++ lib.optional gamemodeSupport gamemode.lib - ++ lib.optional textToSpeechSupport flite - ++ lib.optional controllerSupport libusb1 - ++ additionalLibs; - - runtimePrograms = [ - xorg.xrandr - glxinfo - pciutils # need lspci - ] - ++ additionalPrograms; - - in - [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] - ++ lib.optionals stdenv.isLinux [ - "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - "--prefix PATH : ${lib.makeBinPath runtimePrograms}" - ]; - - inherit (prismlauncher') meta; -} diff --git a/third_party/nixpkgs/pkgs/games/shipwright/default.nix b/third_party/nixpkgs/pkgs/games/shipwright/default.nix index cdb48733eb..5b6c422a6f 100644 --- a/third_party/nixpkgs/pkgs/games/shipwright/default.nix +++ b/third_party/nixpkgs/pkgs/games/shipwright/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more"; mainProgram = "soh"; platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ ivar j0lol matteopacini ]; + maintainers = with lib.maintainers; [ j0lol matteopacini ]; license = with lib.licenses; [ # OTRExporter, OTRGui, ZAPDTR, libultraship mit diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix index d3da340d50..bf2175ed27 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; mainProgram = "sm64ex"; license = licenses.unfree; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; } // extraMeta; } diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix index 92c45cc7c0..151a1ba5be 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ jagajaga jonringer ]; + maintainers = with maintainers; [ jagajaga ]; mainProgram = "steam"; }; } diff --git a/third_party/nixpkgs/pkgs/games/tinyfugue/001-darwin-fixes.patch b/third_party/nixpkgs/pkgs/games/tinyfugue/001-darwin-fixes.patch new file mode 100644 index 0000000000..4a65f274f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/tinyfugue/001-darwin-fixes.patch @@ -0,0 +1,27 @@ +diff --git a/src/malloc.h b/src/malloc.h +index cc4d3bf..bbf78cd 100644 +--- a/src/malloc.h ++++ b/src/malloc.h +@@ -34,6 +34,10 @@ extern int low_memory_warning; + # define realloc(ptr, size) mrealloc(NULL, ptr, size) + # define free(ptr) mfree(NULL, ptr) + #else ++#ifdef __APPLE__ ++ #include ++ #include ++#endif + # define mmalloc(md, size) malloc(size) + # define mcalloc(md, size) calloc(size) + # define mrealloc(md, ptr, size) realloc(ptr, size) +diff --git a/src/tfio.c b/src/tfio.c +index 2cd2103..8640f2b 100644 +--- a/src/tfio.c ++++ b/src/tfio.c +@@ -70,6 +70,7 @@ static void fileputs(const char *str, FILE *fp); + static void filenputs(const char *str, int n, FILE *fp); + static void queueputline(conString *line, TFILE *file); + ++extern void main_loop(void); + + void init_tfio(void) + { diff --git a/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix b/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix index 6cb80663bd..a10c35f967 100644 --- a/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix +++ b/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl, ncurses, zlib -, openssl ? null -, sslSupport ? true +{ + lib, + stdenv, + fetchurl, + ncurses, + zlib, + openssl, + sslSupport ? true, }: assert sslSupport -> openssl != null; @@ -24,11 +29,16 @@ stdenv.mkDerivation rec { sha256 = "12fra2fdwqj6ilv9wdkc33rkj343rdcf5jyff4yiwywlrwaa2l1p"; }; + patches = [ + ./001-darwin-fixes.patch + ]; + configureFlags = optional (!sslSupport) "--disable-ssl"; - buildInputs = - [ ncurses zlib ] - ++ optional sslSupport openssl; + buildInputs = [ + ncurses + zlib + ] ++ optional sslSupport openssl; # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: @@ -45,7 +55,7 @@ stdenv.mkDerivation rec { with any type of text MUD. ''; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.KibaFox ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index 9106ad9f42..285058ffc5 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - hash = "sha256-Db1OwBTA/2jjhu/fOZhwGo7dWV3mZ40y6hTNCCjaRJQ="; + hash = "sha256-IZ3/06MVJGNNSjj9UJ5EWRuzu4baJs3ruYarWTRuGnw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix index 123e296f5e..a54cea0ae9 100644 --- a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix +++ b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { helpMsg = '' We cannot download the full version automatically, as you require a license. Once you have bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux${version}.sh" + You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux.${version}.sh" in the directory where you saved it. ''; diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json index dd11c14e89..24e1f204ee 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,322 @@ { "bluedevil": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/bluedevil-6.1.0.tar.xz", - "hash": "sha256-9ZWwZUgK+o/B57VXPaJGqOJ2h08KGeqwz8tUBKymBoQ=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/bluedevil-6.1.1.tar.xz", + "hash": "sha256-cbaEsptZbByLYDoifvjJswrlF0wnDVog/dS0tthy16A=" }, "breeze": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/breeze-6.1.0.tar.xz", - "hash": "sha256-9xuPTnZ35WhWdqxy+WEBWFPelZseCLpzU5FHzse9HQ4=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/breeze-6.1.1.tar.xz", + "hash": "sha256-iUP/dMTLFrGzwD7qDMo5gh1ES+pg3BY/8Y4r0xNglyU=" }, "breeze-grub": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/breeze-grub-6.1.0.tar.xz", - "hash": "sha256-VglghrnChFxWsUMK+8Rsb6cLiLnxMpvm/XWEm8BmiQ8=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/breeze-grub-6.1.1.tar.xz", + "hash": "sha256-e8I83/5IkprzeL0uL9VpY1mknXWdRJFOGssFJex/5WE=" }, "breeze-gtk": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/breeze-gtk-6.1.0.tar.xz", - "hash": "sha256-F3tosQ/23CLiryzXAq2T6aLksWbGofPfyx1jgl4mWns=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/breeze-gtk-6.1.1.tar.xz", + "hash": "sha256-p5787M7oWtlUhPjmSr8JItjUoMtUde3RACSvlHxOjs4=" }, "breeze-plymouth": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/breeze-plymouth-6.1.0.tar.xz", - "hash": "sha256-Gd8toIZclKuMhfWM0tiVZfQ3nci8iFFmsgGto6mTRc8=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/breeze-plymouth-6.1.1.tar.xz", + "hash": "sha256-8BHr1RBaervFrz2jVQBG8UO1rUX9hQd0KaBY6RA2dxo=" }, "discover": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/discover-6.1.0.tar.xz", - "hash": "sha256-vrkjioN4fcaAMKrB7rpSE4rwOcB8SrL/jez+noYgOwg=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/discover-6.1.1.tar.xz", + "hash": "sha256-GOcAU+flHTLELjcTCC5Q6BhiooEXV6lcmNm2hpLTi14=" }, "drkonqi": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/drkonqi-6.1.0.tar.xz", - "hash": "sha256-5/KbSC0C6HFK0mh/OObtIR8qXpLIVGa5NDIRIBlLp9Q=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/drkonqi-6.1.1.tar.xz", + "hash": "sha256-Z+/eulH1OSz/QshKVDdFbGNK4laWrKOpw64ocFpmUU0=" }, "flatpak-kcm": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/flatpak-kcm-6.1.0.tar.xz", - "hash": "sha256-DykHMvPm7nxOTmnAal3eROvc1eq1GNeC1Av+EAALlic=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/flatpak-kcm-6.1.1.tar.xz", + "hash": "sha256-sc4cl8pPPlAKZAMPvmcjO9M3mKc8XRH4JB662tqjNog=" }, "kactivitymanagerd": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kactivitymanagerd-6.1.0.tar.xz", - "hash": "sha256-yy5tpju5hPZdRbvTB4QEzWVGNT7TwtyTx7QJeNqCdzY=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kactivitymanagerd-6.1.1.tar.xz", + "hash": "sha256-x8DdKkkJAd/PLwlA9TefvhtJ+bMokZ3YBLrq7PlIWqU=" }, "kde-cli-tools": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kde-cli-tools-6.1.0.tar.xz", - "hash": "sha256-vE4iYriz4Y3sAQ7BvqT23c1fNqEnX4TRK29uhjs2Xb4=" - }, - "kde-gtk-config": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kde-gtk-config-6.1.0.tar.xz", - "hash": "sha256-kreRiz7qxjkJiX29odEsTDMlAoF8MIGVYcxTidoRuO8=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kde-cli-tools-6.1.1.tar.xz", + "hash": "sha256-oyo5V9WkwkUBxv5xc11ZK+j57oclLYwnMDIs8wdf/ME=" }, "kdecoration": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kdecoration-6.1.0.tar.xz", - "hash": "sha256-hi6xlzLtGEZDDE3g71YwKsD5rvWtJgcZ0kMbY9yKr6U=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kdecoration-6.1.1.tar.xz", + "hash": "sha256-zxxT0rbojJeMhVfWwLzTSZr/1prsWtXw2ECzgR5ngyM=" + }, + "kde-gtk-config": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kde-gtk-config-6.1.1.tar.xz", + "hash": "sha256-ciZiu3tv7G7yHs8dbaP9qUvq2mvUWMBfK3b+eqU5l6Q=" }, "kdeplasma-addons": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kdeplasma-addons-6.1.0.tar.xz", - "hash": "sha256-y1f6QnsxiKG8emsS4Zb8ESUnQuCPY5fjrwD/rzRnYSc=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kdeplasma-addons-6.1.1.tar.xz", + "hash": "sha256-17MGSyGct4o3pa/0lhIuJQisvWqJRn4oImRYtXS+wSo=" }, "kgamma": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kgamma-6.1.0.tar.xz", - "hash": "sha256-/HuqscZYq7KfqTgpS3aXpyq8cvDDTo6itM4i281dTfk=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kgamma-6.1.1.tar.xz", + "hash": "sha256-PQwFkR5tZ/3cxsLkkDwOjffq4BkaWC1XGZCC1TnvyKI=" }, "kglobalacceld": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kglobalacceld-6.1.0.tar.xz", - "hash": "sha256-89sf4gN5iaz/HvDAPqB3eaysr7YD/q7v7vj4SZtoAxA=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kglobalacceld-6.1.1.tar.xz", + "hash": "sha256-OsdZZCQy1EFaaheFbzOqCetv2pnYhrMac5B/0wDziwA=" }, "kinfocenter": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kinfocenter-6.1.0.tar.xz", - "hash": "sha256-KDyleEkIe8YSldSQX+a/aP98iwGDC4dHn6uavHLbVN4=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kinfocenter-6.1.1.tar.xz", + "hash": "sha256-3z7tLSvYVfgAgCYo7sB1ZbctPJKy7Rw488Xiz4Sw7ig=" }, "kmenuedit": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kmenuedit-6.1.0.tar.xz", - "hash": "sha256-KB9/dC0chX+dpjSrCB+9UYSxDWpr3dUpEr9k9DFkQb8=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kmenuedit-6.1.1.tar.xz", + "hash": "sha256-j4Kbms6XdSmdQ8e0qU4KqzOyhf7prwU/5oljadc8JOI=" }, "kpipewire": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kpipewire-6.1.0.tar.xz", - "hash": "sha256-/MwoeEHuM8EoPL3Kg1DHji5zneulHyV0FpCaoCbNea0=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kpipewire-6.1.1.tar.xz", + "hash": "sha256-ah1aum6vUwYFuyJRTLsXoUTT6MfBpd3w06nOa0gfdoY=" }, "krdp": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/krdp-6.1.0.tar.xz", - "hash": "sha256-MSfrtI0TD/GuuD4KZZj7Iv0LEmS76BqdbD3Sw4qAGJA=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/krdp-6.1.1.tar.xz", + "hash": "sha256-pnBcnksiY0mrp2z2ylliF6DBdzEDDYRheoIXi9r7en0=" }, "kscreen": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kscreen-6.1.0.tar.xz", - "hash": "sha256-FivRlneM93bKZGmq0FmAcx/di4JXD8BF+JYSqXq7RAE=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kscreen-6.1.1.tar.xz", + "hash": "sha256-3OURnXW5ML859y4Qq0vsTTj5F1+y8C4QNo3JjXyIO/k=" }, "kscreenlocker": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kscreenlocker-6.1.0.tar.xz", - "hash": "sha256-CjLFLnTRzE6QRKG+KXgHNqoM+uYZ3/Awl9VnfsnxBnE=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kscreenlocker-6.1.1.tar.xz", + "hash": "sha256-VdU6Bfc31TVp6uwledZVzFyjNl3VrlGHgRGYy5XGcak=" }, "ksshaskpass": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/ksshaskpass-6.1.0.tar.xz", - "hash": "sha256-CmWqVI3U7PSYl4WDg10QNxBICYpiPHTKlQx4/BbqJKk=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/ksshaskpass-6.1.1.tar.xz", + "hash": "sha256-Ltfd0g9kVlts4MSNdNvbRY6HqARZPkRFm+bhxLdT3ac=" }, "ksystemstats": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/ksystemstats-6.1.0.tar.xz", - "hash": "sha256-zlm//t8V/P2g+R7kWZVff+j/0r2hNDV1fnCaRAbv6Tw=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/ksystemstats-6.1.1.tar.xz", + "hash": "sha256-8gfqRhEUPKj4tmCaic30g7X4tJcjTghSFWMahIxOKqs=" }, "kwallet-pam": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kwallet-pam-6.1.0.tar.xz", - "hash": "sha256-sh7YYul1Hf6pOOVXGFrI6qJK4mDveV+5mtdNPEy5aho=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kwallet-pam-6.1.1.tar.xz", + "hash": "sha256-LH8hj0fDcchUOd23cejRjUdXzs2H2nR9O5oudk1tDHo=" }, "kwayland": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kwayland-6.1.0.tar.xz", - "hash": "sha256-xzbPiMgdkHrxPkCo7qR1VHbcIkw19jvPeRUDl130UH0=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kwayland-6.1.1.tar.xz", + "hash": "sha256-3JHUr7c72z6rYFKFoQJYkD48EVqYcqwLp5LO9GiP24U=" }, "kwayland-integration": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kwayland-integration-6.1.0.tar.xz", - "hash": "sha256-kblfkvmSZ5UquVTZ1t1+8HZTAHPy0g1A7qICdJfYNsg=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kwayland-integration-6.1.1.tar.xz", + "hash": "sha256-yL1Xas0uf+xw3SqJy1069sfW/Hp49JFq9CW4Ta+sUrk=" }, "kwin": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kwin-6.1.0.tar.xz", - "hash": "sha256-UK/9bFwjzCxqjCPXQaZrBvZnnILH/Tyv6mamsGQ7Ty8=" + "version": "6.1.1.2", + "url": "mirror://kde/stable/plasma/6.1.1/kwin-6.1.1.2.tar.xz", + "hash": "sha256-HPDk2ZbM2Sp3tqclYQyjKmDC+uCKmPi3LyqvFWlGTDk=" }, "kwrited": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/kwrited-6.1.0.tar.xz", - "hash": "sha256-F9z4QZtdDXdevWhQmVPKe3M46/rU51dandc2TpEOIOE=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/kwrited-6.1.1.tar.xz", + "hash": "sha256-pvh6xoSIYzRuhWryDO76PsHCE2DRrwV2j+mwiKE/fH8=" }, "layer-shell-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/layer-shell-qt-6.1.0.tar.xz", - "hash": "sha256-Vb2OgZonmwWf4p2/Rj+PFfgzcHN5xxkVPsdQt7UIIdg=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/layer-shell-qt-6.1.1.tar.xz", + "hash": "sha256-fGDjcwHo80PvSWVJS2AYb9qCeY3Smq27NXEtr2LjT1M=" }, "libkscreen": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/libkscreen-6.1.0.tar.xz", - "hash": "sha256-wZPUO8wltih3CfGC5OYV9QtKleErutyitxQyBiSvq3Q=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/libkscreen-6.1.1.tar.xz", + "hash": "sha256-lhL9g86Cj4Fv1Vznnadyv2Lpa45kV97rXcM2klz8INQ=" }, "libksysguard": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/libksysguard-6.1.0.tar.xz", - "hash": "sha256-bR6a964QsSSrYqynDi89oVt0KnL3wGRvjCGff0tl42o=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/libksysguard-6.1.1.tar.xz", + "hash": "sha256-vB7YBDc4ZdPeUeXhz3rRHEtx6hMREKOUByWwQzLK7lI=" }, "libplasma": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/libplasma-6.1.0.tar.xz", - "hash": "sha256-7SXwTKaKBAlkt7zbBDy3C+69+HgMYwJqWyyxPGu+dTs=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/libplasma-6.1.1.tar.xz", + "hash": "sha256-LyTxDNIyop+h3FYY7jAGCOm13HeYo+L/+wqOQ5zEItA=" }, "milou": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/milou-6.1.0.tar.xz", - "hash": "sha256-e2gqTq2FrW28MoI7jU3JQbSVHlBwn9TTPNml3DSJvkY=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/milou-6.1.1.tar.xz", + "hash": "sha256-rxF9ASnqRAv9VEJA7wvdMATmv+i1i8g2ovMG2fX+z4M=" }, "ocean-sound-theme": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/ocean-sound-theme-6.1.0.tar.xz", - "hash": "sha256-nsZVxPPxT55qBEUP2yyomn97Ve228X7TbZr1ZuvgBfA=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/ocean-sound-theme-6.1.1.tar.xz", + "hash": "sha256-trYOgt+h/dqCuUy0cF6ShRQxSYKYYKhqgfhI1e0s91M=" }, "oxygen": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/oxygen-6.1.0.tar.xz", - "hash": "sha256-paAuWqy8qCjJhd+Nqbyq0LabVfymjBLwyvhS5woPW20=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/oxygen-6.1.1.tar.xz", + "hash": "sha256-v3GXhxUsM0qC+OfC4LeqGhLEEo6VARMHAm8Ue4/bgtA=" }, "oxygen-sounds": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/oxygen-sounds-6.1.0.tar.xz", - "hash": "sha256-7sCIyky+3zmafrYlAT0b8bOTPgGAb8eeFZeS2X9jQ9E=" - }, - "plasma-activities": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-6.1.0.tar.xz", - "hash": "sha256-z3rQIIRAVqYvW9jXkrW8/cJV6gU97FHA+RBAJj9P+fg=" - }, - "plasma-activities-stats": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-stats-6.1.0.tar.xz", - "hash": "sha256-0R3Rla1kK7BXW/13fBMjvq6opk2VkW0iH8b8ZytV7RU=" - }, - "plasma-browser-integration": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-browser-integration-6.1.0.tar.xz", - "hash": "sha256-8dpzTyPiLMUBPtpriuL/4nQ/lNN/EzQKxXXCFne5A5Y=" - }, - "plasma-desktop": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-desktop-6.1.0.tar.xz", - "hash": "sha256-ATHGaI2bAhBn5G0cFLiiWJXwbQ9Pdx/15J3kFgRJJM4=" - }, - "plasma-disks": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-disks-6.1.0.tar.xz", - "hash": "sha256-VKxFan5XP+6c6LkXUL+9q+CfG0+fQt1+qRU9dyfgthE=" - }, - "plasma-firewall": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-firewall-6.1.0.tar.xz", - "hash": "sha256-sct/qtoHGU6D/PH93wXF/pK2zvSi7LQUgbPMkCQXBwo=" - }, - "plasma-integration": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-integration-6.1.0.tar.xz", - "hash": "sha256-8P/6n80DVp9sgI6NwecQfAjzC61o/m6PzD3ancB/v6c=" - }, - "plasma-mobile": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-mobile-6.1.0.tar.xz", - "hash": "sha256-hvATS/pn8QwgdExI3JGIfb7pba4k8BeaU0m3XmoJwvg=" - }, - "plasma-nano": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-nano-6.1.0.tar.xz", - "hash": "sha256-01m8dwqVD7ear4OpyWQg+K2M/zJO1Q54T4SpPatxATU=" - }, - "plasma-nm": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-nm-6.1.0.tar.xz", - "hash": "sha256-U1Kv+bZzUYYJRQANCXID1TvhJMDxB8h7MkKBiYD1RpA=" - }, - "plasma-pa": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-pa-6.1.0.tar.xz", - "hash": "sha256-4squGRC7896AJHvUZUWNPXmI5s5gNOtj2pdj7xqtJjk=" - }, - "plasma-sdk": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-sdk-6.1.0.tar.xz", - "hash": "sha256-oDKFPYakiYW9MTlCD67m6q7nV5YsG4zveNQ0BGCtS08=" - }, - "plasma-systemmonitor": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-systemmonitor-6.1.0.tar.xz", - "hash": "sha256-tJqhz3tvhOp99xFyml0/b9AAREviorkP9l4Nu63JEiQ=" - }, - "plasma-thunderbolt": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-thunderbolt-6.1.0.tar.xz", - "hash": "sha256-OG/68iQGUBzoWE6MjIY0TS6RGa+BFYgoJT5TDDVFwI0=" - }, - "plasma-vault": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-vault-6.1.0.tar.xz", - "hash": "sha256-tItJkyeQS4fto8v4+BSQRFDZO37vr5U8Y9HzfdnW0j0=" - }, - "plasma-welcome": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-welcome-6.1.0.tar.xz", - "hash": "sha256-GDF8qwiZixUExd2JFAN6QMqV7bRA9FxhN6Zq/fii9wA=" - }, - "plasma-workspace": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz", - "hash": "sha256-9PVC5vIB9GCA7m+5Ztn4lYEajc19TxikxsSM4MNaEnw=" - }, - "plasma-workspace-wallpapers": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-wallpapers-6.1.0.tar.xz", - "hash": "sha256-DLke5HhfzK04Pivi3RWwRFD4vAWUw5hvdYYP3tykZ1E=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/oxygen-sounds-6.1.1.tar.xz", + "hash": "sha256-2FjoAmz4gMTHTxm9WoG3pATKrNM8+Y+kMmGK/2dWzlE=" }, "plasma5support": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plasma5support-6.1.0.tar.xz", - "hash": "sha256-4YMrMhq+krNzamEDdB7C1BZFMR2CKVXznsyJOOStVyo=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma5support-6.1.1.tar.xz", + "hash": "sha256-+LhQb0Mm6W+RjdbpyyBAunhep50zytV14zy+mE7gttc=" + }, + "plasma-activities": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-6.1.1.tar.xz", + "hash": "sha256-Pb3ZJAIIxd/SypY+FCJWRFokRZRz7/azKTAn0NPM6NU=" + }, + "plasma-activities-stats": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-stats-6.1.1.tar.xz", + "hash": "sha256-QoRnkP9GHvcM3Nt+3BDzvs8JXgL55hL6GsflJRBNthM=" + }, + "plasma-browser-integration": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-browser-integration-6.1.1.tar.xz", + "hash": "sha256-QI4lgS60nNP63ysp+O6cXwQZiaEqJnRBIMcxUDjlxPc=" + }, + "plasma-desktop": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-desktop-6.1.1.tar.xz", + "hash": "sha256-leOtnDAYzQWiJm+Xf5ZMJBWEXVgc3aEPDxUXzQDJ9k4=" + }, + "plasma-disks": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-disks-6.1.1.tar.xz", + "hash": "sha256-/usBYRT9rdhi4Yu7hC3eP+hpNdQXXdNW8J5jZkJYpTQ=" + }, + "plasma-firewall": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-firewall-6.1.1.tar.xz", + "hash": "sha256-JyiCRQe9Ntxv8MK1m5GYmEIVpnpznJwnw//QWrPJOnM=" + }, + "plasma-integration": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-integration-6.1.1.tar.xz", + "hash": "sha256-GAvqiS1t0knpjgwyD8rVVzVDQL1sCVjn/nkow0flWX0=" + }, + "plasma-mobile": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-mobile-6.1.1.tar.xz", + "hash": "sha256-jqjUaFExJWvNMQsKITCnQKMwO6sxhHCx9pAw6MK0TAU=" + }, + "plasma-nano": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-nano-6.1.1.tar.xz", + "hash": "sha256-r2GJdq5D7AZdc/cuGOut+yXz6tZwYtam6APrEgT601I=" + }, + "plasma-nm": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-nm-6.1.1.tar.xz", + "hash": "sha256-NqL3CKrFGvkHuIZk+WQfrFVAsfVfMmufIWLuDLV9+1A=" + }, + "plasma-pa": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-pa-6.1.1.tar.xz", + "hash": "sha256-Takyf7qhz5gD5SjGlS+ZeapEe4BiZE+AB9vCkILUyHk=" + }, + "plasma-sdk": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-sdk-6.1.1.tar.xz", + "hash": "sha256-/UNWfSSJXesWE4v5k6lmL+2tVk03IhOSZYrpdGVND5A=" + }, + "plasma-systemmonitor": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-systemmonitor-6.1.1.tar.xz", + "hash": "sha256-c4FiyY5lCKPqoQNh7fun4ObNd/eX6ZXzZuQqpS1A6eM=" + }, + "plasma-thunderbolt": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-thunderbolt-6.1.1.tar.xz", + "hash": "sha256-dP6Wd4ml2/P2g5lpt5uuDTAVWz/RFdoPW+cqXSF8FFo=" + }, + "plasma-vault": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-vault-6.1.1.tar.xz", + "hash": "sha256-Kw0gcn4LgHWQ1fn47ZIA4eQsMYSRnfQVDN2BeV0K8+Q=" + }, + "plasma-welcome": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-welcome-6.1.1.tar.xz", + "hash": "sha256-2uKtZMCIcNuVbZEClxt+I5hF9CDaLtnv30oEU/qtqd4=" + }, + "plasma-workspace": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-6.1.1.tar.xz", + "hash": "sha256-R9LEK9+MEn+hZW9luqmCj5iQz/0/QWsK+eBWzyKMB+4=" + }, + "plasma-workspace-wallpapers": { + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-wallpapers-6.1.1.tar.xz", + "hash": "sha256-B/IttxPbjjyCJ0Y5Xok6wS2DRbjDeksJUrujUOW2ffs=" }, "plymouth-kcm": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/plymouth-kcm-6.1.0.tar.xz", - "hash": "sha256-fS3hRSIl3UUmx0YZMAWTxY2s8PY7OApE2RyO6vLBvKs=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/plymouth-kcm-6.1.1.tar.xz", + "hash": "sha256-ZqB/YNbDO+F9k6s7UZnOGxWnvmtRJ7Tw07SsHk5BfdA=" }, "polkit-kde-agent-1": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/polkit-kde-agent-1-6.1.0.tar.xz", - "hash": "sha256-QQaWh6qBGJvYMwyp0IHiFXnkbYFek4SdWHQeq+Fn7sI=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/polkit-kde-agent-1-6.1.1.tar.xz", + "hash": "sha256-H4tLoKEKAbzh+lTy0TpADnA612TeBMvLU20VOv0Xrpg=" }, "powerdevil": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/powerdevil-6.1.0.tar.xz", - "hash": "sha256-RFsqU2a8HWSwRUfv5ucTt1otMwn+Ryfp7fYVe+bdRYA=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/powerdevil-6.1.1.tar.xz", + "hash": "sha256-SVB26QNmiYOZ9sL+4iotH+lphSSnxvLKzYL4yo1pnyc=" }, "print-manager": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/print-manager-6.1.0.tar.xz", - "hash": "sha256-xjx0BUhkCHdQQJAp7kiBvBFlq5POYBZp7cvzjMLyAhU=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/print-manager-6.1.1.tar.xz", + "hash": "sha256-sRDyMcsvn5RPOveqaCIOHM/x4OV5Hk/xSVQTpFI9umY=" }, "qqc2-breeze-style": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/qqc2-breeze-style-6.1.0.tar.xz", - "hash": "sha256-raTAxWIsGluCXpsQQuC+cTUq3aRGQJS7beIclxAu4m8=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/qqc2-breeze-style-6.1.1.tar.xz", + "hash": "sha256-3i7dyPFyXS2753jOrgJfDDkO5UcxCgAOeD//E+AmqPw=" }, "sddm-kcm": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/sddm-kcm-6.1.0.tar.xz", - "hash": "sha256-GzCrvNGEp/RgoZY2qlDvfaNOa25BLubL+XrpW0146tw=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/sddm-kcm-6.1.1.tar.xz", + "hash": "sha256-B8CUtRCaOTdFqMiyj13+ZWueIuvr9b2zsoCSU7XeIHE=" }, "systemsettings": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/systemsettings-6.1.0.tar.xz", - "hash": "sha256-vZSxNCBkeUoULLKF7RAqbbaVm/JoLU5mHVYNc0poylw=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/systemsettings-6.1.1.tar.xz", + "hash": "sha256-FTs5ru2DB7USV0lQCBQ6FUxs+mTTupKGBjmjFQuhpxE=" }, "wacomtablet": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/wacomtablet-6.1.0.tar.xz", - "hash": "sha256-0evmQyKNRwrVzClMWs0BD0ArpzqnfCpFKljTrIPIPIU=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/wacomtablet-6.1.1.tar.xz", + "hash": "sha256-Jo/SZCP7oIXrciKU4+dXGYlh+mJ1qR5zgfq9gaODqIA=" }, "xdg-desktop-portal-kde": { - "version": "6.1.0", - "url": "mirror://kde/stable/plasma/6.1.0/xdg-desktop-portal-kde-6.1.0.tar.xz", - "hash": "sha256-BUzmYjI07AvobqAA1/sTz5V+T8QqJIVBKS+jgx2ATbM=" + "version": "6.1.1", + "url": "mirror://kde/stable/plasma/6.1.1/xdg-desktop-portal-kde-6.1.1.tar.xz", + "hash": "sha256-vIFULW/3kgRkOCd5CdQDE3/Vscr/oiNJvd0PFP9EKAQ=" } -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix index c20cff446e..f9105b4f16 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-ZXQm+exVz+xafwSEjtK03yrIv8szwlYmrSOSGdRE7pg="; + hash = "sha256-9eRNen19/YZsUpuwBPcgQBNgmhbJdXCR/NssbFvgD/M="; }; extraBuildInputs = [qtdeclarative]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index 1a7fce2701..e0cf96bd63 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.8.13"; + version = "0.4.8.17"; src = fetchFromGitHub { - owner = "Ryochan7"; + owner = "C0rn3j"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-vK/5S+GyqVfKTqn5PaPmOV/tXE9PIW57gqYxvhGaJSg="; + rev = "v${version}"; + sha256 = "sha256-arBdPrFtdllWMn1KuZ+PlENiJ0oRPVbgVjbef+pv+IE="; }; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix index 26a25f5173..74f9932794 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.16"; + version = "2.25.17"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-AY8NfcZsD+JD45Ua1c9UHeQXqWSOqxqAQPWqqrRDLhY="; + hash = "sha256-AVGd/H2+lQxUYyXGB2dOBU4rpqR5LSkn3ishu5uqDYs="; }; passthru.updateScript = { diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix index 4fcee6fa9b..a8bf0eabbe 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; - ignoredVersions = "^[^.]+$"; # ignore versions without a dot + allowedVersions = "\\."; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index eeccd0fa07..e288e6d216 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -40,8 +40,10 @@ makeScopeWithSplicing' { stdenvLibcMinimal = crossLibcStdenv.override (old: { cc = old.cc.override { libc = self.libcMinimal; + noLibc = false; bintools = old.cc.bintools.override { libc = self.libcMinimal; + noLibc = false; sharedLibraryLoader = null; }; }; @@ -98,7 +100,7 @@ makeScopeWithSplicing' { inherit (buildNetbsd) makeMinimal; }; - libcMinimal = self.callPackage ./pkgs/libcMinimal.nix { + libcMinimal = self.callPackage ./pkgs/libcMinimal/package.nix { inherit (self) headers csu; inherit (buildNetbsd) netbsdSetupHook diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/0001-Allow-building-libc-without-generating-tags.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/0001-Allow-building-libc-without-generating-tags.patch new file mode 100644 index 0000000000..0c13f650ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/0001-Allow-building-libc-without-generating-tags.patch @@ -0,0 +1,53 @@ +From 62acd447e36d5009d3008e025df72c08690905d5 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Thu, 20 Jun 2024 15:48:54 -0400 +Subject: [PATCH] Allow building libc without generating tags + +When bootstrapping from scratch, it is nice to avoid dependencies (like +`ctags`/`genassym`/etc.) that are not strictly needed. + +This makefile change introduces a new `MK_LIBC_TAGS` variable, defaulted +to `yes`, to control whether `make all` / `make install` should +build/install (respectively) the tags. + +The underlying rules for tags can still be run regardless of the choice +of variable. +--- + lib/libc/Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/libc/Makefile b/lib/libc/Makefile +index f2dab2a090e7..c6aa5e45f959 100644 +--- a/lib/libc/Makefile ++++ b/lib/libc/Makefile +@@ -132,7 +132,12 @@ MKREPRO_SED= -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}/\\\\&/g};/usr/src;' + .endif + + .if !defined(MLIBDIR) && ${RUMPRUN} != "yes" ++realall: ${SRCS} ++ ++.if ${MK_LIBC_TAGS:Uyes} == "yes" + realall: tags ++.endif ++ + tags: ${SRCS} + ${_MKTARGET_CREATE} + -${TOOL_CTAGS} -f ${.TARGET}.tmp -w ${.ALLSRC:M*.c} +@@ -146,11 +151,14 @@ tags: ${SRCS} + .endif + rm -f ${.TARGET}.tmp + ++.if ${MK_LIBC_TAGS:Uyes} == "yes" + FILES= tags + FILESNAME= libc.tags + FILESDIR= /var/db + .endif + ++.endif ++ + + # workaround for I18N stuffs: build singlebyte setlocale() for libc.a, + # multibyte for libc.so. the quirk should be removed when we support +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal.nix rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/package.nix index bbab20d53d..c1ef174414 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcMinimal/package.nix @@ -28,7 +28,6 @@ mkDerivation { "out" "dev" "man" - "tags" ]; USE_FORT = "yes"; MKPROFILE = "no"; @@ -39,32 +38,44 @@ mkDerivation { "sys" "external/bsd/jemalloc" ]; + + patches = [ + # https://mail-index.netbsd.org/tech-toolchain/2024/06/24/msg004438.html + # + # The patch is vendored because the archive software inlined my + # attachment so I am not sure how to programmatically download it. + ./0001-Allow-building-libc-without-generating-tags.patch + ]; + nativeBuildInputs = [ bsdSetupHook netbsdSetupHook makeMinimal install + tsort + lorder mandoc groff + statHook flex byacc - genassym gencat - lorder - tsort - statHook - rpcgen ]; + buildInputs = [ headers csu ]; + env.NIX_CFLAGS_COMPILE = "-B${csu}/lib -fcommon"; - meta.platforms = lib.platforms.netbsd; + SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; + MK_LIBC_TAGS = "no"; NLSDIR = "$(out)/share/nls"; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db" ]; + postInstall = '' pushd ${headers} find include -type d -exec mkdir -p "$dev/{}" ';' @@ -75,11 +86,11 @@ mkDerivation { find lib -type d -exec mkdir -p "$out/{}" ';' find lib '(' -type f -o -type l ')' -exec cp -pr "{}" "$out/{}" ';' popd - - moveToOutput var/db/libc.tags "$tags" ''; postPatch = '' sed -i 's,/usr\(/include/sys/syscall.h\),${headers}\1,g' lib/lib*/sys/Makefile.inc ''; + + meta.platforms = lib.platforms.netbsd; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix index 8e0ef5fd1b..ad9c9dd229 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -2,7 +2,6 @@ lib, stdenvLibcMinimal, mkDerivation, - headers, libcMinimal, librt, }: diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index c217f6a7ce..9ebbaa974c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -11,7 +11,6 @@ lorder, mandoc, statHook, - headers, }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/default.nix index bfc88f0978..4db2df57bc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/default.nix @@ -1,5 +1,7 @@ { lib, + crossLibcStdenv, + stdenvNoCC, makeScopeWithSplicing', generateSplicesForMkScope, buildPackages, @@ -19,32 +21,71 @@ makeScopeWithSplicing' { directory = ./pkgs; } // { - libc = self.callPackage ./pkgs/libc/package.nix { - inherit (self) csu include; - inherit (buildOpenbsd) makeMinimal; - inherit (buildPackages.netbsd) - install - gencat - rpcgen - tsort - ; - }; + version = "7.5"; + + stdenvLibcMinimal = crossLibcStdenv.override (old: { + cc = old.cc.override { + libc = self.libcMinimal; + noLibc = false; + bintools = old.cc.bintools.override { + libc = self.libcMinimal; + noLibc = false; + sharedLibraryLoader = null; + }; + }; + }); + makeMinimal = buildPackages.netbsd.makeMinimal.override { inherit (self) make-rules; }; - mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { - inherit (buildPackages.netbsd) install; - inherit (buildPackages.buildPackages) rsync; - }; + + # The manual callPackages below should in principle be unnecessary, but are + # necessary. See note in ../netbsd/default.nix + include = self.callPackage ./pkgs/include/package.nix { inherit (buildOpenbsd) makeMinimal; inherit (buildPackages.netbsd) install rpcgen mtree; }; + csu = self.callPackage ./pkgs/csu.nix { inherit (self) include; inherit (buildOpenbsd) makeMinimal; inherit (buildPackages.netbsd) install; }; - make-rules = self.callPackage ./pkgs/make-rules/package.nix { }; + + libcMinimal = self.callPackage ./pkgs/libcMinimal/package.nix { + inherit (self) csu include; + inherit (buildOpenbsd) makeMinimal; + inherit (buildPackages.netbsd) + install + gencat + tsort + rpcgen + ; + }; + + librpcsvc = self.callPackage ./pkgs/librpcsvc.nix { + inherit (buildOpenbsd) openbsdSetupHook makeMinimal lorder; + inherit (buildPackages.netbsd) + install + tsort + statHook + rpcgen + ; + }; + + libutil = self.callPackage ./pkgs/libutil.nix { + inherit (self) libcMinimal; + inherit (buildOpenbsd) openbsdSetupHook makeMinimal lorder; + inherit (buildPackages.netbsd) install tsort statHook; + }; + lorder = self.callPackage ./pkgs/lorder.nix { inherit (buildPackages.netbsd) install; }; + + make-rules = self.callPackage ./pkgs/make-rules/package.nix { }; + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { + inherit (buildPackages.netbsd) install tsort; + inherit (buildPackages.buildPackages) rsync; + }; } ); } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix new file mode 100644 index 0000000000..895b82ed53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix @@ -0,0 +1,47 @@ +{ + lib, + symlinkJoin, + libcMinimal, + librthread, + libm, + librpcsvc, + libutil, + version, +}: + +symlinkJoin rec { + name = "${pname}-${version}"; + pname = "libc-openbsd"; + inherit version; + + outputs = [ + "out" + "dev" + "man" + ]; + + paths = + lib.concatMap + (p: [ + (lib.getDev p) + (lib.getLib p) + (lib.getMan p) + ]) + [ + libcMinimal + libm + librthread + librpcsvc + libutil + ]; + + postBuild = '' + rm -r "$out/nix-support" + mkdir -p "$man/share/man" + mv "$out/share"/man* "$man/share/man" + rmdir "$out/share" + fixupPhase + ''; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/disable-librebuild.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/disable-librebuild.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/disable-librebuild.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/disable-librebuild.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/netbsd-make-to-lower.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/netbsd-make-to-lower.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/netbsd-make-to-lower.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/netbsd-make-to-lower.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix rename to third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix index 1a6b6d06a1..d8d6cc398e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix @@ -20,18 +20,16 @@ mkDerivation { noLibc = true; - pname = "libc"; path = "lib/libc"; + pname = "libcMinimal-openbsd"; + outputs = [ + "out" + "dev" + "man" + ]; extraPaths = [ "lib/csu/os-note-elf.h" "sys/arch" - - "lib/libm" - "lib/libpthread" - "lib/librpcsvc" - "lib/librpcsvc" - "lib/librthread" - "lib/libutil" ]; patches = [ @@ -48,12 +46,8 @@ mkDerivation { openbsdSetupHook makeMinimal install - flex - byacc - gencat - rpcgen - ctags tsort + gencat ]; buildInputs = [ @@ -73,49 +67,22 @@ mkDerivation { ) "--undefined-version"; makeFlags = [ - "STRIP=-s" # flag to install, not command "COMPILER_VERSION=clang" "LIBC_TAGS=no" ]; postInstall = '' - symlink_so () { - pushd $out/lib - ln -s "lib$1".so.* "lib$1.so" - popd - } - - symlink_so c - pushd ${include} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + find include -type d -exec mkdir -p "$dev/{}" ';' + find include '(' -type f -o -type l ')' -exec cp -pr "{}" "$dev/{}" ';' popd - substituteInPlace $out/include/sys/time.h --replace "defined (_LIBC)" "true" + substituteInPlace "$dev/include/sys/time.h" --replace "defined (_LIBC)" "true" pushd ${csu} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + find lib -type d -exec mkdir -p "$out/{}" ';' + find lib '(' -type f -o -type l ')' -exec cp -pr "{}" "$out/{}" ';' popd - - NIX_CFLAGS_COMPILE+=" -B$out/lib" - NIX_CFLAGS_COMPILE+=" -I$out/include" - NIX_LDFLAGS+=" -L$out/lib" - - make -C $BSDSRCDIR/lib/libm $makeFlags - make -C $BSDSRCDIR/lib/libm $makeFlags install - symlink_so m - - make -C $BSDSRCDIR/lib/librthread $makeFlags - make -C $BSDSRCDIR/lib/librthread $makeFlags install - symlink_so pthread - - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install - symlink_so rpcsv - - make -C $BSDSRCDIR/lib/libutil $makeFlags - make -C $BSDSRCDIR/lib/libutil $makeFlags install - symlink_so util ''; + + meta.platforms = lib.platforms.openbsd; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libm.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libm.nix new file mode 100644 index 0000000000..bf7e933a09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libm.nix @@ -0,0 +1,16 @@ +{ lib, mkDerivation }: + +mkDerivation { + path = "lib/libm"; + + libcMinimal = true; + + outputs = [ + "out" + "man" + ]; + + extraPaths = [ "sys" ]; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librpcsvc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librpcsvc.nix new file mode 100644 index 0000000000..77783a0418 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librpcsvc.nix @@ -0,0 +1,38 @@ +{ + lib, + mkDerivation, + bsdSetupHook, + openbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + rpcgen, + statHook, +}: + +mkDerivation { + path = "lib/librpcsvc"; + + libcMinimal = true; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + bsdSetupHook + openbsdSetupHook + makeMinimal + install + tsort + lorder + rpcgen + statHook + ]; + + makeFlags = [ "INCSDIR=$(dev)/include/rpcsvc" ]; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix new file mode 100644 index 0000000000..1d42d55290 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenvLibcMinimal, + mkDerivation, + libcMinimal, +}: + +mkDerivation { + path = "lib/librthread"; + + libcMinimal = true; + + outputs = [ + "out" + "dev" + ]; + + makeFlags = [ "LIBCSRCDIR=../libc" ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + extraPaths = [ + "lib/libpthread" + libcMinimal.path + #"sys" + ]; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix new file mode 100644 index 0000000000..627fabe8cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvLibcMinimal, + mkDerivation, + libcMinimal, + bsdSetupHook, + openbsdSetupHook, + makeMinimal, + byacc, + install, + tsort, + lorder, + mandoc, + statHook, +}: + +mkDerivation { + path = "lib/libutil"; + + libcMinimal = true; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + bsdSetupHook + openbsdSetupHook + makeMinimal + byacc + install + tsort + lorder + mandoc + statHook + ]; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 371c6c58b9..a238a326f4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -3,6 +3,7 @@ stdenv, stdenvNoCC, crossLibcStdenv, + stdenvLibcMinimal, runCommand, rsync, source, @@ -10,6 +11,8 @@ openbsdSetupHook, makeMinimal, install, + tsort, + lorder, }: lib.makeOverridable ( @@ -20,6 +23,8 @@ lib.makeOverridable ( stdenvNoCC else if attrs.noLibc or false then crossLibcStdenv + else if attrs.libcMinimal or false then + stdenvLibcMinimal else stdenv; in @@ -46,15 +51,12 @@ lib.makeOverridable ( openbsdSetupHook makeMinimal install + tsort + lorder ]; HOST_SH = stdenv'.shell; - makeFlags = [ - "STRIP=-s" # flag to install, not command - "-B" - ]; - MACHINE_ARCH = { # amd64 not x86_64 for this on unlike NetBSD @@ -85,9 +87,6 @@ lib.makeOverridable ( // lib.optionalAttrs stdenv'.hasCC { # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; - - # Since STRIP in `makeFlags` has to be a flag, not the binary itself - STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh index 50e79bc292..c0fee276fe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh @@ -17,5 +17,18 @@ setBinownBingrp() { export BINGRP=$(id -g) } +makeOpenBSDUnversionedLinks() { + [[ -d "$out/lib" ]] || return 0 + pushd "$out/lib" + local l + for l in lib*.so.*; do + l="${l//.so.*/}" + [[ ! -f "$l.so" ]] || continue + ln -s "$l".so.* "$l.so" + done + popd +} + preConfigureHooks+=(addOpenBSDMakeFlags) postPatchHooks+=(fixOpenBSDInstallDirs setBinownBingrp) +preFixupHooks+=(makeOpenBSDUnversionedLinks) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/source.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/source.nix index 359c3f2fbc..a92dfbd2b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/source.nix @@ -1,8 +1,12 @@ -{ fetchcvs }: +{ + lib, + fetchcvs, + version, +}: fetchcvs { cvsRoot = "anoncvs@anoncvs.fr.openbsd.org/cvs"; module = "src"; - tag = "OPENBSD_7_5"; + tag = "OPENBSD_${lib.replaceStrings [ "." ] [ "_" ] version}-RELEASE"; sha256 = "sha256-hzdATew6h/FQV72SWtg3YvUXdPoGjm2SoUS7m3c3fSU="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh index f9453708ab..bc8d372ca8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh @@ -28,7 +28,6 @@ addMakeFlags() { # Definitions passed to share/mk/*.mk. Should be pretty simple - # eventually maybe move it to a configure script. - export DESTDIR= export USETOOLS=never export NOCLANGERROR=yes export NOGCCERROR=yes diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index a49f1a305c..6e629432fd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.77.1"; + version = "1.77.3"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-+Itz6U1DHV9ZsgjzuvrfVtCJ1yiGSpVOkD28BmHibIQ="; + hash = "sha256-KSIrK16JEAib0joprIm0SYwA2bKCEBLVn7WYfHV9YCg="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix index f2cd30fd6f..4a12dc2dfe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/swiftbar/default.nix @@ -1,7 +1,8 @@ -{ lib -, fetchzip -, stdenvNoCC -, makeWrapper +{ + lib, + fetchzip, + stdenvNoCC, + makeWrapper, }: stdenvNoCC.mkDerivation rec { @@ -17,9 +18,7 @@ stdenvNoCC.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -41,6 +40,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; platforms = platforms.darwin; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ matteopacini ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index 5e3768447e..6c890b075f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240221"; + version = "20240625"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-Zbztl8ZFLS2UME8LtbahINKk6OUG5jo0O07awMXCPWY="; + hash = "sha256-SlUZElep8ZBkYl+5VPDESZ5sKwIQ+xa0+pB4WmJkNt8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix index af804262f2..52d87f4deb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kahing/catfs"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything-module/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything-module/default.nix new file mode 100644 index 0000000000..5ee7c8a35e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything-module/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, deepin +, kernel +}: + +stdenv.mkDerivation { + pname = "deepin-anything-module"; + inherit (deepin.deepin-anything) version src; + sourceRoot = "${deepin.deepin-anything.src.name}/src/kernelmod"; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildPhase = '' + runHook preBuild + make kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/lib/modules/${kernel.modDirVersion}/extra *.ko + runHook postInstall + ''; + + meta = deepin.deepin-anything.meta // { + description = "Deepin Anything file search tool (kernel modules)"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 8f5655a90c..331e69c84b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.17.29377.6"; + version = "24.22.29735.20"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-+bx6P1vZlgolHrINzkH4ukXT+hgAtH18DOX6vb9vPVs="; + hash = "sha256-M+buuVTd0w1Js6eDKln+LFhQgeNU4KCbN6vK8PyUdG8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix index 5edc227732..0620f1dee7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/joycond/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Userspace daemon to combine joy-cons from the hid-nintendo kernel driver"; mainProgram = "joycond"; license = licenses.gpl3Only; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index 4722c0a64a..42a315b0fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,11 +1,11 @@ { "testing": { - "version": "6.10-rc4", - "hash": "sha256:1cx7c25fa8pvabhwph0rdqdryalxgl7rs1ry0v4k048bxpisvahf" + "version": "6.10-rc5", + "hash": "sha256:1bjqcgik4mgjshwy7p45msd62rmq8wjyz7b60n4fsm3kyk16imcd" }, "6.1": { - "version": "6.1.95", - "hash": "sha256:1gfz2j6iixbr0dfkb8jkwnb4gicrm5rc5lsa24wmyrkm3nmg0q19" + "version": "6.1.96", + "hash": "sha256:1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry" }, "5.15": { "version": "5.15.161", @@ -24,15 +24,15 @@ "hash": "sha256:0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4" }, "6.6": { - "version": "6.6.35", - "hash": "sha256:17nxymy3r9q45cfzc9rqp937m37zr1b8fjn1m0x0dv8jhxrfxqzw" + "version": "6.6.36", + "hash": "sha256:1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr" }, "6.8": { "version": "6.8.12", "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.6", - "hash": "sha256:0jvbv5g9xx76a4ni0b66gzj5i2y77gpmfdg0mdsg564rp3i6chsx" + "version": "6.9.7", + "hash": "sha256:1y01w26sas7pl24l09yczdr8mzzy2nadykz1wmhx9ygfj76qixg4" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index b5be3ba723..2d9d51afe4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -43,6 +43,6 @@ in linux.override { passthru.updateScript = ./update-libre.sh; - maintainers = with lib.maintainers; [ qyliss ivar ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index a515cc1924..3154538ee7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.94-rt33"; # updated by ./update-rt.sh + version = "6.1.95-rt34"; # 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 = "0sakp5k4q2xfd3la7j8s2rcbvndh6fdqgzz5ivyqf0df4anp3siq"; + sha256 = "1gfz2j6iixbr0dfkb8jkwnb4gicrm5rc5lsa24wmyrkm3nmg0q19"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0yawgw6s8zd6a2n165aqg861giamgpsissj9mw6ax3a7wvg19zjr"; + sha256 = "1kz9j8d677vr5sfxrvfd2a8vpmz3vsrvb82rdvvf09ikpdvsa6iy"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index b0cda7d071..a200edfb41 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.34-rt33"; # updated by ./update-rt.sh + version = "6.6.35-rt34"; # 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 = "180v8q5376gl6zmjd54qcb1wpmz7cq299bdbhmz738rsb67yrq64"; + sha256 = "17nxymy3r9q45cfzc9rqp937m37zr1b8fjn1m0x0dv8jhxrfxqzw"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1sbbdv3mcca04g27vc7n4xv4kfhn9nz8xrhzzwc2r3f2x83ficwp"; + sha256 = "0rijfk9n3fdrwg61ih2x95w4ffjs037hfjv3bza3xb7j04y7hxgy"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b2c4d0a6a6..c2f7ef4447 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.33"; - hash = "sha256-3qGxIYNVm2f69rym0Ya1X497G7yRNj3lLCtVgyEZ9yw="; + version = "6.6.36"; + hash = "sha256-8L8e5iP4pvIvgqHmQYhFRCbgLvuFOXr7nkBe0VnuCzw="; variant = "lts"; }; mainVariant = { - version = "6.9.4"; - hash = "sha256-gY0t77aPWOuRZFESNp0OLIsjLAv+rf0NHbab9WF2VtA="; + version = "6.9.7"; + hash = "sha256-hmVcwC1PHjyCw43IpJ99y72qFXSX5lbbh6+1TqdXzag="; variant = "main"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9d15662162..77d66ecd1d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.9.6"; #zen + version = "6.9.7"; #zen suffix = "zen1"; #zen - sha256 = "09s3h4wiqfh8nsb1xw78qn2pqdjm8cff89f1q8r2p8hfzs6zpc1b"; #zen + sha256 = "1hs238vpwna8fry65x2909npw97b8zyvbadigl1yqm6f4ibcmhkj"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.9.5"; #lqx + version = "6.9.7"; #lqx suffix = "lqx1"; #lqx - sha256 = "0r3pgjfyza3vkvp7kw1s7sn1gf4hxq6r6qs5wvv76gmff7s399yz"; #lqx + sha256 = "09z48hnjw0qfvn3b7gm9gs7ixki590wcgy7pm0cw2y41c67f725y"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix index f289287743..966ac7c945 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix @@ -6,12 +6,12 @@ with lib; stdenv.mkDerivation rec { pname = "libsemanage"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/libsemanage-${version}.tar.gz"; - sha256 = "sha256-QROPRiIkOeEkLyfBWH6Vz1SgWSWarxaB22QswwxODWA="; + sha256 = "sha256-4WbK4ppBfasAjbnKCHQCPzU6MBewdpOgNu2XSH7aNbE="; }; outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix index de21502455..23f79e7f66 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchurl, linuxHeaders } : +{ lib, stdenv, fetchFromGitHub, linuxHeaders } : stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.2"; + version = "4.3"; - src = fetchurl { - url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - hash = "sha256-cOOOXSdk4CF0Q9pvFOiEb+QBpHIpOsE42EGcB6ZlRHo="; + src = fetchFromGitHub { + owner = "nwtime"; + repo = "linuxptp"; + rev = "v${version}"; + hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI="; }; + outputs = [ "out" "man" ]; + postPatch = '' - substituteInPlace incdefs.sh --replace \ + substituteInPlace incdefs.sh --replace-fail \ '/usr/include/linux/' "${linuxHeaders}/include/linux/" ''; @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "https://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.nwtime.org"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index aa614aec12..dea9ab721a 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -217,8 +217,10 @@ installPhase() { --set-rpath $out/lib:$libPath $bin/bin/$i fi done - # FIXME: needs PATH and other fixes - # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh + substituteInPlace nvidia-bug-report.sh \ + --replace /bin/grep grep \ + --replace /bin/ls ls + install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh fi runHook postInstall diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index e08ffa1500..14dcb0e8e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -42,12 +42,12 @@ rec { }; latest = selectHighestVersion production (generic { - version = "550.54.14"; - sha256_64bit = "sha256-jEl/8c/HwxD7h1FJvDD6pP0m0iN7LLps0uiweAFXz+M="; - sha256_aarch64 = "sha256-sProBhYziFwk9rDAR2SbRiSaO7RMrf+/ZYryj4BkLB0="; - openSha256 = "sha256-F+9MWtpIQTF18F2CftCJxQ6WwpA8BVmRGEq3FhHLuYw="; - settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; - persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; + version = "555.58"; + sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; + sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE="; + openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c="; + settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; + persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw="; }); beta = selectHighestVersion latest (generic { @@ -62,11 +62,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.63"; + version = "550.40.65"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-YvlNgxcFsCl3DzHFpKe+VXzfc0QIgf3N/hTKsWZ7gDE="; - openSha256 = "sha256-mITh1kdSPtB+jP6TDHw04EN7gRx48KGbzbLO0wTSS/U="; + sha256_64bit = "sha256-du86GHMBxzUkrP+nDzModBdxH3d1TueLPH5KeYSNKYU="; + openSha256 = "sha256-REBOh5bW7vUXa0sIGWddahPd1SR3GwBN4nmpv+m4Tak="; 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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 2cbc184636..3f6c5d1caa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -239,7 +239,7 @@ let platforms = [ "x86_64-linux" ] ++ optionals (sha256_32bit != null) [ "i686-linux" ] ++ optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; - maintainers = with maintainers; [ jonringer kiskae edwtjo ]; + maintainers = with maintainers; [ kiskae edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index 5f9e2e8cf1..b82a9e6816 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ hhm ivar ]; + maintainers = with maintainers; [ hhm ]; broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix index 126f927007..ffc5639cf8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-7tuI8rISTlOPLWFL4GPA2aw+rMDFGk2kRQDKHtG6FvQ="; + sha256 = "sha256-2wZBrq/v7EZhLHwt3TPvEGC7chzmSELSqWwz3dtesXY="; }; buildInputs = [ libsepol ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index ff149e771b..1162b3363c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles, pkg-config -, luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb -, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kernel, + installShellFiles, + pkg-config, + luajit, + ncurses, + perl, + jsoncpp, + openssl, + curl, + jq, + gcc, + elfutils, + tbb, + protobuf, + grpc, + yaml-cpp, + nlohmann_json, + re2, + zstd, + uthash, + clang, + libbpf, + bpftools, +}: let - # Compare with https://github.com/draios/sysdig/blob/0.37.1/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.16.0"; - libsHash = "sha256-aduO2pLj91tRdZ1dW1F1JFEg//SopialXWPd6Oav/u8="; + # Compare with https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/falcosecurity-libs.cmake + libsRev = "0.17.2"; + libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ="; - # Compare with https://github.com/falcosecurity/libs/blob/0.16.0/cmake/modules/valijson.cmake + # Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake valijson = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; @@ -15,16 +41,17 @@ let hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; }; - # https://github.com/draios/sysdig/blob/0.37.1/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "7.1.0+driver"; + rev = "7.2.0+driver"; hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; - version = "0.37.1"; -in stdenv.mkDerivation { + version = "0.38.0"; +in +stdenv.mkDerivation { pname = "sysdig"; inherit version; @@ -32,10 +59,15 @@ in stdenv.mkDerivation { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-V1rvQ6ZznL9UiUFW2lyW6gvdoGttOd5kgT2KPQCjmvQ="; + hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U="; }; - nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; + nativeBuildInputs = [ + cmake + perl + installShellFiles + pkg-config + ]; buildInputs = [ luajit ncurses @@ -53,6 +85,9 @@ in stdenv.mkDerivation { nlohmann_json zstd uthash + clang + libbpf + bpftools ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -97,48 +132,56 @@ in stdenv.mkDerivation { # fix compiler warnings been treated as errors "-Wno-error"; - preConfigure = '' - if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then - echo "falcosecurity-libs checksum needs to be updated!" - exit 1 - fi - cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") - '' + lib.optionalString (kernel != null) '' - export INSTALL_MOD_PATH="$out" - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ''; + preConfigure = + '' + if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then + echo "falcosecurity-libs checksum needs to be updated!" + exit 1 + fi + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") + '' + + lib.optionalString (kernel != null) '' + export INSTALL_MOD_PATH="$out" + export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ''; - postInstall = '' - # Fix the bash completion location - installShellCompletion --bash $out/etc/bash_completion.d/sysdig - rm $out/etc/bash_completion.d/sysdig - rmdir $out/etc/bash_completion.d - rmdir $out/etc - '' + lib.optionalString (kernel != null) '' - make install_driver - kernel_dev=${kernel.dev} - kernel_dev=''${kernel_dev#${builtins.storeDir}/} - kernel_dev=''${kernel_dev%%-linux*dev*} - if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then - sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko - else - for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do - if test -f "$i"; then - xz -d $i - sed -i "s#$kernel_dev#................................#g" ''${i%.xz} - xz -9 ''${i%.xz} - fi - done - fi - ''; + postInstall = + '' + # Fix the bash completion location + installShellCompletion --bash $out/etc/bash_completion.d/sysdig + rm $out/etc/bash_completion.d/sysdig + rmdir $out/etc/bash_completion.d + rmdir $out/etc + '' + + lib.optionalString (kernel != null) '' + make install_driver + kernel_dev=${kernel.dev} + kernel_dev=''${kernel_dev#${builtins.storeDir}/} + kernel_dev=''${kernel_dev%%-linux*dev*} + if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then + sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko + else + for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do + if test -f "$i"; then + xz -d $i + sed -i "s#$kernel_dev#................................#g" ''${i%.xz} + xz -9 ''${i%.xz} + fi + done + fi + ''; meta = { - description = - "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; - license = with lib.licenses; [ asl20 gpl2Only mit ]; + description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; + license = with lib.licenses; [ + asl20 + gpl2Only + mit + ]; maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); + broken = + kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); homepage = "https://sysdig.com/opensource/"; downloadPage = "https://github.com/draios/sysdig/releases"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix index 553e471faa..8177c7d1ef 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix @@ -21,8 +21,7 @@ let }; appimageContents = appimageTools.extract { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; in stdenvNoCC.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix index ad98366210..f428ef803b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix @@ -34,6 +34,6 @@ mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix index ef54be5bb7..7044561211 100644 --- a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix @@ -1,102 +1,70 @@ -{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps, - majorVersion ? "1.0" }: +{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps }: let versionMap = { - "3.5" = { - kafkaVersion = "3.5.0"; + "3_7" = { + kafkaVersion = "3.7.0"; scalaVersion = "2.13"; - sha256 = "sha256-KjpGjgab5XDxbWEqgZbC96kge36shlvpNNIM4SUusvg="; + sha256 = "sha256-ZfJuWTe7t23+eN+0FnMN+n4zeLJ+E/0eIE8aEJm/r5w="; jre = jdk17_headless; }; - "3.4" = { - kafkaVersion = "3.4.1"; + "3_6" = { + kafkaVersion = "3.6.2"; scalaVersion = "2.13"; - sha256 = "sha256-p28XpSuPLNMd4RVx/zZqcUggtuTgKJOwFZ0J2w7a+Zg="; + sha256 = "sha256-wxfkf3cUHTFG6VY9nLodZIbIHmcLIR7OasRqn3Lkqqw="; jre = jdk17_headless; }; - "3.3" = { - kafkaVersion = "3.3.2"; - scalaVersion = "2.13"; - sha256 = "sha256-Gv5XrpXnEajH8fSbcfIfURz+QPcqTrJ1oe3SGXYLNRc="; - jre = jdk17_headless; - }; - "3.2" = { - kafkaVersion = "3.2.3"; - scalaVersion = "2.13"; - sha256 = "sha256-tvkbwBP83M1zl31J4g6uu4/LEhqJoIA9Eam48fyT24A="; - jre = jdk17_headless; - }; - "3.1" = { - kafkaVersion = "3.1.2"; - scalaVersion = "2.13"; - sha256 = "sha256-SO1bTQkG3YQSv657QjwBeBCWbDlDqS3E5eUp7ciojnI="; - jre = jdk17_headless; - }; - "3.0" = { - kafkaVersion = "3.0.2"; - scalaVersion = "2.13"; - sha256 = "sha256-G8b6STGlwow+iDqMCeZkF3HTKd94TKccmyfZ7AT/7yE="; - jre = jdk17_headless; - }; - "2.8" = { - kafkaVersion = "2.8.2"; - scalaVersion = "2.13"; - sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ="; - jre = jdk11_headless; - }; - - }; -in - -with versionMap.${majorVersion}; - -stdenv.mkDerivation rec { - version = "${scalaVersion}-${kafkaVersion}"; - pname = "apache-kafka"; - - src = fetchurl { - url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre bash gnugrep gnused coreutils ps ]; + build = versionInfo: with versionInfo; stdenv.mkDerivation rec { + version = "${scalaVersion}-${kafkaVersion}"; + pname = "apache-kafka"; - installPhase = '' - mkdir -p $out - cp -R config libs $out + src = fetchurl { + url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; + inherit sha256; + }; - mkdir -p $out/bin - cp bin/kafka* $out/bin - cp bin/connect* $out/bin + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre bash gnugrep gnused coreutils ps ]; - # allow us the specify logging directory using env - substituteInPlace $out/bin/kafka-run-class.sh \ - --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"' + installPhase = '' + mkdir -p $out + cp -R config libs $out - substituteInPlace $out/bin/kafka-server-stop.sh \ - --replace 'ps' '${ps}/bin/ps' + mkdir -p $out/bin + cp bin/kafka* $out/bin + cp bin/connect* $out/bin - for p in $out/bin\/*.sh; do - wrapProgram $p \ - --set JAVA_HOME "${jre}" \ - --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" - done - chmod +x $out/bin\/* - ''; + # allow us the specify logging directory using env + substituteInPlace $out/bin/kafka-run-class.sh \ + --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"' - passthru = { - inherit jre; # Used by the NixOS module to select the supported jre + substituteInPlace $out/bin/kafka-server-stop.sh \ + --replace 'ps' '${ps}/bin/ps' + + for p in $out/bin\/*.sh; do + wrapProgram $p \ + --set JAVA_HOME "${jre}" \ + --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ + --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" + done + chmod +x $out/bin\/* + ''; + + passthru = { + inherit jre; # Used by the NixOS module to select the supported jre + }; + + meta = with lib; { + homepage = "https://kafka.apache.org"; + description = "High-throughput distributed messaging system"; + license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = [ maintainers.ragge ]; + platforms = platforms.unix; + }; }; - - meta = with lib; { - homepage = "https://kafka.apache.org"; - description = "High-throughput distributed messaging system"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ maintainers.ragge ]; - platforms = platforms.unix; - }; -} +in with lib; mapAttrs' + (majorVersion: versionInfo: nameValuePair "apacheKafka_${majorVersion}" (build versionInfo)) + versionMap diff --git a/third_party/nixpkgs/pkgs/servers/asouldocs/default.nix b/third_party/nixpkgs/pkgs/servers/asouldocs/default.nix index df6a5e3012..ee8ced4f15 100644 --- a/third_party/nixpkgs/pkgs/servers/asouldocs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asouldocs/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { description = "Web server for multi-language, real-time synchronization and searchable documentation"; homepage = "https://asouldocs.dev/"; license = licenses.mit; - maintainers = with maintainers; [ ivar anthonyroussel ]; + maintainers = with maintainers; [ anthonyroussel ]; mainProgram = "asouldocs"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 4c24712614..0b38091b34 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.11.7.1"; + version = "24.05.0.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-TR2dZXdM8SgBD8C/CHe8Zadh2xAzbtb4hgOfhCXkF0M="; + hash = "sha256-nPTgasNajSzSTv+64V7ykwFV5eZt300KMWQDlqNIz44="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index fa7b53382c..d9d6b2fd57 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987"; + sha256 = "18ceb398578342e9a3d5b75f2423945a2f8d1d7c730f24f4d2aa4a24b50e831d"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index eecef52e2b..b1e0e8b050 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.9.1"; + version = "4.10.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-psI6U+6BEfpx53t1ZdG49IbqaVdwgWWF+93xTkNn5t8="; + sha256 = "sha256-YxfX9ePwHDORLzE9ZqM90azhzffxnVxZCy5DDYykYF8="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index c56be24eaa..e7db616aa9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -4094,7 +4094,7 @@ ha-ffmpeg ]; "slack" = ps: with ps; [ - slackclient + slack-sdk ]; "sleepiq" = ps: with ps; [ asyncsleepiq diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix index 85bef16159..136c360104 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "epex_spot"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "mampfes"; repo = "ha_epex_spot"; rev = "refs/tags/${version}"; - hash = "sha256-8cxEOCzlQbS3HbQMBo7/rZb/GfpJvOWayLttEaEENYs="; + hash = "sha256-BwNDI2OMF6bXqFcdr0AJgj9Gb6Uz8BWOfE7M4jqzQJc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 02f83ba82b..82822e1c1f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -441,6 +441,22 @@ let ]; }; + slack-sdk = super.slack-sdk.overridePythonAttrs (oldAttrs: rec { + version = "2.5.0"; + src = fetchFromGitHub { + owner = "slackapi"; + repo = "python-slackclient"; + rev = "refs/tags/${version}"; + hash = "sha256-U//HUe6e41wOOzoaDl4yXPnEASCzpGBIScHStWMN8tk="; + }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "pytest-runner" "" + ''; + pythonImportsCheck = [ "slack" ]; + doCheck = false; # Tests changed a lot for > 3 + }); + tuf = super.tuf.overridePythonAttrs rec { version = "2.1.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py b/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py index e25b603361..df410fb498 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py @@ -42,6 +42,7 @@ PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", "ollama-hass": "ollama", + "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp", diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch deleted file mode 100644 index 31dfe08f91..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dd3509a7d646a970480f94a8e09f377e9783504d Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 16:07:58 +0200 -Subject: [PATCH 4/4] nixpkgs: add cstdint in dd-trace-cpp - ---- - bazel/repositories.bzl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index d91aa712bd..467348e773 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -772,7 +772,11 @@ def _io_opentelemetry_api_cpp(): - ) - - def _com_github_datadog_dd_trace_cpp(): -- external_http_archive("com_github_datadog_dd_trace_cpp") -+ external_http_archive( -+ name = "com_github_datadog_dd_trace_cpp", -+ patch_args = ["-p1"], -+ patches = ["@envoy//bazel:dd_trace_cpp.patch"], -+ ) - native.bind( - name = "dd_trace_cpp", - actual = "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/dd_trace_cpp.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/dd_trace_cpp.patch deleted file mode 100644 index d9873c8f1a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/dd_trace_cpp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4851a6a722b228ecbfd9df255dab3d8f30bd84b9 Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 15:36:33 +0200 -Subject: [PATCH] nixpkgs: add cstdint to fix compilation under GCC 13 - -https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes ---- - src/datadog/parse_util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h -index c603286..c8e4e83 100644 ---- a/src/datadog/parse_util.h -+++ b/src/datadog/parse_util.h -@@ -2,6 +2,7 @@ - - // This component provides parsing-related miscellanea. - -+#include - #include - #include - #include --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix index f979cc92ba..be4f904289 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -24,15 +24,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.2"; - rev = "d79f6e8d453ee260e9094093b8dd31af0056e67b"; - hash = "sha256-qbe9M4dH7NFDY5UF17urJ6WvnZNhvdMU4HAg0BaL+KA="; + version = "1.30.4"; + rev = "32113313a357829ba3a5dce0795b6780bf8cbf4d"; + hash = "sha256-u9lTVe40pwXTt0YRwJXRuZonS5KJL2JQUQ3L9ymuA74="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-/IpTRFBkif1HSycPrWxphKTnhL6wHgPAweyxoXZ1oVg="; - aarch64-linux = "sha256-uA1CHKzdBht+WYxgwR2g5t7fRybhbo6Hgpzdr+H1vqY="; + x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ="; + aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage { @@ -55,8 +55,6 @@ buildBazelPackage { 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 - - cp ${./dd_trace_cpp.patch} bazel/dd_trace_cpp.patch ''; patches = [ @@ -68,11 +66,6 @@ buildBazelPackage { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch - - # apply patch to dd-trace-cpp - # remove once a version of dd-trace-cpp is released and adopted by envoy - # that contains https://github.com/DataDog/dd-trace-cpp/commit/3a8e1e9a3cf4e87ef053e954a39dc7a967ac6965 - ./0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix index 48d43dfe64..53c7742642 100644 --- a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -10,12 +10,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.21.4"; - version = "${nginxVersion}.3"; + nginxVersion = "1.25.3"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "sha256-M6hMY8/Z5GsOXGLrLdx7gGi9ouFoYxQ0O4n8P/0kzdM="; + sha256 = "sha256-MuwaJTpaEyUDVaB1/mW31j7EXFYLviEzUPCZKlfNed8="; }; # generic.nix applies fixPatch on top of every patch defined there. @@ -40,7 +40,8 @@ callPackage ../nginx/generic.nix args rec { configureFlags = [ "--with-http_postgres_module" ]; postInstall = '' - ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty + ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty + ln -sf $out/nginx/bin/nginx $out/bin/openresty ln -s $out/nginx/bin/nginx $out/bin/nginx ln -s $out/nginx/conf $out/conf ln -s $out/nginx/html $out/html diff --git a/third_party/nixpkgs/pkgs/servers/http/router/default.nix b/third_party/nixpkgs/pkgs/servers/http/router/default.nix index 7cd2a604fc..f915db2073 100644 --- a/third_party/nixpkgs/pkgs/servers/http/router/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/router/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.30.1"; + version = "1.49.1"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mQtIjfXDcEy5HfZbWauL0NQLPneGq9EJt/yB8zMuhSU="; + hash = "sha256-Dhl8CKXMeiZ38hDbNviKBzg6zmCpO2wJFWHHZbJXJWI="; }; - cargoHash = "sha256-XCDU6cXw+Wf5MR6m+HCI8/VFRRylMywktZbd5k7Lcwo="; + cargoHash = "sha256-FbIUvjm1tYMbsWdwu78drUQuMjcl6Ju/pPV9pmWHcf4="; nativeBuildInputs = [ cmake @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; cargoTestFlags = [ - "-- --skip=uplink::test::stream_from_uplink_error_no_retry" + "-- --skip=query_planner::tests::missing_typename_and_fragments_in_requires" ]; meta = with lib; { @@ -44,6 +44,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.apollographql.com/docs/router/"; license = licenses.elastic20; maintainers = [ maintainers.bbigras ]; - knownVulnerabilities = [ "CVE-2023-45812" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix b/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix index a5e73a3019..6ea011ab80 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ircd-hybrid"; - version = "8.2.43"; + version = "8.2.44"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; - sha256 = "sha256-vQNzx4DjCMGm9piQFf8o4cIpme92S3toY2tihXPCUe8="; + sha256 = "sha256-a/DC/1/GQ9wXV6Iyyb1YJdM4kcfMGDfwJK1P/3xhxnk="; }; buildInputs = [ openssl zlib libxcrypt ]; diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix index b469e46cf1..e0c5accca2 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix @@ -11,20 +11,20 @@ mkYarnPackage rec { pname = "jellyseerr"; - version = "1.8.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; rev = "v${version}"; - hash = "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8="; + hash = "sha256-TXe/k/pb7idu7G1wGu6TZksnoFQ5/PN0voVlve3k1UI="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k="; + hash = "sha256-2iRxguxEI+YKm8ddhRgZMvfZuUgQmCK5ER4jMCFJQMQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json b/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json index 39613efb5f..6e97347f75 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/package.json @@ -1,6 +1,6 @@ { "name": "jellyseerr", - "version": "1.8.1", + "version": "1.9.2", "private": true, "scripts": { "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", @@ -44,6 +44,7 @@ "axios-rate-limit": "1.3.0", "bcrypt": "5.1.0", "bowser": "2.11.0", + "cacheable-lookup": "^7.0.0", "connect-typeorm": "1.1.4", "cookie-parser": "1.4.6", "copy-to-clipboard": "3.3.3", diff --git a/third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix b/third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix index 01e66309e5..26b91355a7 100644 --- a/third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jitsi-excalidraw/default.nix @@ -9,13 +9,13 @@ buildNpmPackage rec { pname = "jitsi-excalidraw-backend"; - version = "17"; + version = "21"; src = fetchFromGitHub { owner = "jitsi"; repo = "excalidraw-backend"; rev = "x${version}"; - hash = "sha256-aQePkVA8KRL06VewiD0ePRpj88pAItcV7B2SBnRRtCs="; + hash = "sha256-52LU5I2pNjSb9+nJjiczp/dLWRTwQDC+thyGXBvkBBA="; }; npmDepsHash = "sha256-BJqjaqTeg5i+ECGMuiBYVToK2i2XCOVP9yeDFz6nP4k="; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 079ad6cd84..a7e93fcbce 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-06-21"; + version = "0.12.0-unstable-2024-06-27"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "6d70050261ec3290f3c2e4015438e4910fd430d0"; - sha256 = "sha256-vN1lrFM/ifcMCZfrvfK/MDLYx0qnAMgfBW9UWdyv+MY="; + rev = "4d21ffc1d67d4aa9886cc691441afccc057b975d"; + sha256 = "sha256-LvYEE3/VYgLK2c/NB4wey87025eoyADPV6w1CV/Uejs="; }; sourceRoot = "${src.name}/klippy"; diff --git a/third_party/nixpkgs/pkgs/servers/krill/default.nix b/third_party/nixpkgs/pkgs/servers/krill/default.nix index 0f27b36be5..a8847215d6 100644 --- a/third_party/nixpkgs/pkgs/servers/krill/default.nix +++ b/third_party/nixpkgs/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-J/QChAFjcUdtrfs5KUIRwfJdfCB/gRnIUNyinf66Slo="; + hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; }; - cargoHash = "sha256-Cwrgdo+mirH3kGXwBgCzeO1xiEhSrt/Fx8LxhaBJJLE="; + cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix index 1c77969ad4..4774ea410a 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.18"; + version = "0.99.19"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-zqqCgmzea25H1wcvgIb4hIV3maReL9tmNxvo9JsSlZk="; + hash = "sha256-w4VL+MioNeJ/R48Ln9tYaqlfg7NvT3mQs0dWOZTHQK4="; }; vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 0b7822a3c5..7abf6b2559 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.49.12"; + version = "0.50.5"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-+THQ4i7wMO/76MNjdvDoqstFcXknZ5/F82TNXn07gnQ="; + hash = "sha256-UfRENrld7uc65xsh9mMh2CuPEspAV3IwsdZXN44ACnM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 93be1992f3..01d92fdde0 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -21,13 +21,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-06-13T22-53-53Z"; + version = "2024-06-22T05-26-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-SqrL1fYVy7OylepQGmTm6p77q3vssNdWyJ5+9wZHehQ="; + hash = "sha256-r5T6e2Wzb0uJ7VI6fIHxswkGPi1MsGSj4sC225PQb+o="; }; vendorHash = "sha256-AK6PGX/ezkN/LAnOLd8fRGkzwhTE4BY63H9ebnXxEOA="; diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix index 027235986c..a7d1374493 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; + sha256 = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; }; separateDebugInfo = true; - cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; + cargoHash = "sha256-u7mzViTc0f4vApmmRNl6NkJlMfKeWSO0yupBt6adiag="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index 149f7f5b80..5d46addfc9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${finalAttrs.version}"; - hash = "sha256-LD572aR6g67pH3QllnLD3g0bnck+vlC/YTN83WamHRs="; + hash = "sha256-irr6JVCE3krcD3kScGR8maSbvsNPeQFqWm5oNl9OhQU="; }; patches = [ ./nagios.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix deleted file mode 100644 index 818a8dbb88..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: - -buildGoPackage rec { - pname = "minio-exporter"; - version = "0.2.0"; - rev = "v${version}"; - - goPackagePath = "github.com/joe-pll/minio-exporter"; - - src= fetchFromGitHub { - inherit rev; - owner = "joe-pll"; - repo = "minio-exporter"; - sha256 = "1my3ii5s479appiapw8gjzkq1pk62fl7d7if8ljvdj6qw4man6aa"; - }; - - # Required to make 0.2.0 build against latest dependencies - # TODO: Remove on update to 0.3.0 - patches = [ - (fetchpatch { - url = "https://github.com/joe-pll/minio-exporter/commit/50ab89d42322dc3e2696326a9ae4d3f951f646de.patch"; - sha256 = "0aiixhvb4x8c8abrlf1i4hmca9i6xd6b638a5vfkvawx0q7gxl97"; - }) - ]; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Prometheus exporter for Minio cloud storage server"; - mainProgram = "minio-exporter"; - homepage = "https://github.com/joe-pll/minio-exporter"; - license = licenses.asl20; - maintainers = with maintainers; [ bachp ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix deleted file mode 100644 index 1993975e2b..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix +++ /dev/null @@ -1,174 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; - sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/minio/minio-go"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio-go"; - rev = "d218e4cb1bfc13dcef0eb5c3e74507a35be0dd3a"; - sha256 = "0d3am33xaavdffz791qi2s0vnkpjw9vlr5p5g4lw7h5vhmy1sjb4"; - }; - } - { - goPackagePath = "github.com/minio/minio"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio"; - rev = "bb73c84b104bc447eb603d63481cdc54b8ab3c83"; - sha256 = "1gjkgdf59yxfr2a7pl3f7z3iid86zsd85xqxcv1s0d46v7j07iga"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; - sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "89604d197083d4781071d3c65855d24ecfb0a563"; - sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "b15cd069a83443be3154b719d0cc9fe8117f09fb"; - sha256 = "1cr45wg2m40bj2za8f32mq09rjlcnk5kfam0h0hr8wcb015k4wxj"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"; - sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a6600008915114d9c087fad9f03d75087b1a74df"; - sha256 = "099vyf8133bjwaqcv377d9akam3j5xwamwqrihmjhvzbvqs649yc"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec"; - sha256 = "0bdwdxy2gz48icnh023r5fga3z4x6c8gry8jlfjqr5w12y3s281g"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2c42eef0765b9837fbdab12011af7830f55f88f0"; - sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 00a3b15652..fe14c2d1bb 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.16"; + version = "2.10.17"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-OyDDAx1jmemFn9D4VJPWrLJJM1YB8tZBC7N3xrUYodA="; + hash = "sha256-JX5uV4273BzO0tmdagEDlJ8eyaFBlpdOS6F1rz9IrF4="; }; - vendorHash = "sha256-g1BF0Xl3AwHKSJ3k/gfJN5L875SdoDGK0Lk2gUUq4y4="; + vendorHash = "sha256-JAj4lF/5cy9SDFb0X08d2kFUVwdUJ53EYeEOlJ71z2k="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 7e853eed71..54de74a4c7 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -1,5 +1,4 @@ { lib, stdenvNoCC, fetchurl, nixosTests -, nextcloud27Packages , nextcloud28Packages , nextcloud29Packages }: @@ -42,21 +41,15 @@ let }; }; in { - nextcloud27 = generic { - version = "27.1.10"; - hash = "sha256-lD4ScNdxp8gNqisy5ylM6MO3e56u9yrYs4SH1YyFB1Y="; - packages = nextcloud27Packages; - }; - nextcloud28 = generic { - version = "28.0.6"; - hash = "sha256-3w0zhLRHy6HhKPIggPZ4BSH4aBab6r7o6g0VW/nGa48="; + version = "28.0.7"; + hash = "sha256-WOh1S4Ip/UTr1ykmQlaRlbi2R4xArBCaoIbIa1yrp9k="; packages = nextcloud28Packages; }; nextcloud29 = generic { - version = "29.0.2"; - hash = "sha256-LUnSl9w0AJICEFeCPo54oxK8APVt59hneseQWQkYqxc="; + version = "29.0.3"; + hash = "sha256-pZludkwSCSf4hE2PWyjHNrji8ygLEgvhOivXcxzbf9Q="; packages = nextcloud29Packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json deleted file mode 100644 index dbab86fde2..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json +++ /dev/null @@ -1,362 +0,0 @@ -{ - "bookmarks": { - "sha256": "06pprhlaaqdha2nmfdcf76mhh48hdr5jlv88snxji8lpflv50wr5", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz", - "version": "13.1.3", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\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": { - "sha256": "09rsp5anpaqzwmrixza5qh12vmq9hd3an045064vm3rnynz537qc", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.6/calendar-v4.7.6.tar.gz", - "version": "4.7.6", - "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": { - "sha256": "0xyrkr5p7xa8cn33kgx1hyblpbsdzaakpfm5bk6w9sm71a42688w", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz", - "version": "5.5.3", - "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": { - "sha256": "06d1rhvcwxzi8hl99nz3hg32fznv0q5m06cwjy3gc81j53qz0ksc", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/cookbook-0.10.5.tar.gz", - "version": "0.10.5", - "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": { - "sha256": "04cpsd638p8midpznbz0nhdmcm5zfgq9n6yh1xifnvmfkd5k2wj0", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.6.1/cospend-1.6.1.tar.gz", - "version": "1.6.1", - "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": { - "sha256": "0h5dspj6cvhc5q69xqxp6y36c6h659nf7zk9zrhksc2fjvvdmzwz", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.4/deck-v1.11.4.tar.gz", - "version": "1.11.4", - "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": { - "sha256": "1ha77k2mzr1q63fs1h8ff7vxkhry6vfj2ci1va7m8dkjn7s9pk5c", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.13.1/end_to_end_encryption-v1.13.1.tar.gz", - "version": "1.13.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" - ] - }, - "files_markdown": { - "sha256": "0p97ha6x3czzbflavmjn4jmz3z706h5f84spg4j7dwq3nc9bqrf7", - "url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.1/files_markdown-v2.4.1.tar.gz", - "version": "2.4.1", - "description": "Markdown Editor extends the Nextcloud text editor with a live preview for markdown files.\n\nA full list of features can be found [in the README](https://github.com/icewind1991/files_markdown)", - "homepage": "https://github.com/icewind1991/files_markdown", - "licenses": [ - "agpl" - ] - }, - "files_texteditor": { - "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", - "version": "2.15.1", - "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", - "homepage": "https://github.com/nextcloud/files_texteditor", - "licenses": [ - "agpl" - ] - }, - "forms": { - "sha256": "0shdkqhip988dng2105k5cjbqfqny5791h8gdachcv3vnq99fywi", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.7/forms-v3.4.7.tar.gz", - "version": "3.4.7", - "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", - "homepage": "https://github.com/nextcloud/forms", - "licenses": [ - "agpl" - ] - }, - "gpoddersync": { - "sha256": "1hk052864mb49crmsy2m9alv22rk7ns6m6q7l372j7py9gr8rf60", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", - "version": "3.9.0", - "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", - "homepage": "https://github.com/thrillfall/nextcloud-gpodder", - "licenses": [ - "agpl" - ] - }, - "groupfolders": { - "sha256": "00c387vjz5sxw3gv61m4p3jby50bcadk8dwpz0zsd5wbhwffd63q", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.7/groupfolders-v15.3.7.tar.gz", - "version": "15.3.7", - "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.", - "homepage": "https://github.com/nextcloud/groupfolders", - "licenses": [ - "agpl" - ] - }, - "impersonate": { - "sha256": "1rpqi7yqzhmdqfl2hq326zv91gn246bgqjzcimsiap20f22z169j", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.14.0/impersonate-v1.14.0.tar.gz", - "version": "1.14.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": { - "sha256": "1cb5csdn85y5fkwhbxxl9i1qy92iqx9v9ccavcp66xfpyk4dlf22", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v1.1.5/integration_openai-v1.1.5.tar.gz", - "version": "1.1.5", - "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 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 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 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 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 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" - ] - }, - "mail": { - "sha256": "1q0ihgrb6sk0rizs45clqhjpmai2m2zislw6s1694j1zssz4jpqg", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.1/mail-v3.7.1.tar.gz", - "version": "3.7.1", - "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" - ] - }, - "maps": { - "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", - "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", - "version": "1.2.0", - "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", - "licenses": [ - "agpl" - ] - }, - "memories": { - "sha256": "1wahnkc253bgm0bqciyhfh1iyl8girbj8mzdd29l0k1bks8fr4qc", - "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", - "version": "7.3.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": { - "sha256": "04dh6vzriiiqnn02pjbwn9rv0q427njbx558jl504jp91b8qd2wn", - "url": "https://github.com/owncloud/music/releases/download/v1.11.0/music_1.11.0_for_nextcloud.tar.gz", - "version": "1.11.0", - "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" - ] - }, - "news": { - "sha256": "1bkh73h0ibxyjpy3cmvhnlr7isvgqkcxdw2dw15mxksj2cln9wki", - "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz", - "version": "24.0.0", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": [ - "agpl" - ] - }, - "notes": { - "sha256": "0j9bwbfvwwdaabyc79i514sp36cm4i9z02l8bkxlqr9fvim73nn9", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.0/notes.tar.gz", - "version": "4.10.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": { - "sha256": "14s8g3dqwrxjz1zww64n1lhwdb8374wr1b5v76xhawypmfz2a68h", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.12/notify_push-v0.6.12.tar.gz", - "version": "0.6.12", - "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": { - "sha256": "1vflj70q8d0hrfck9c5l1k4qa38gpdh3zjgx4aqamnlbvkfssk7h", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.2.2/onlyoffice.tar.gz", - "version": "9.2.2", - "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": { - "sha256": "1i28xgzp85yb44ay2l2zw18fk00yd6fh6yddj92gdrljb3w9zpap", - "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": { - "sha256": "0wijb8dkszyzs3108qylcjnvd3kdhlciqndhgc993ybwqxqxfsxn", - "url": "https://github.com/nextcloud/polls/releases/download/v6.4.1/polls.tar.gz", - "version": "6.4.1", - "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": { - "sha256": "0505kg4pxa6dqylniwa5ip6h5bama8cp0ng2y7prhb93mnhgr051", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.5.0/previewgenerator-v5.5.0.tar.gz", - "version": "5.5.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": { - "sha256": "0y4cv4hagmax4nkdfzysd5fg2h2xak4m87waf3b0ci5f1bwdxdxx", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.4.0/qownnotesapi-nc.tar.gz", - "version": "24.4.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": { - "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", - "version": "2.2.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": { - "sha256": "161v7gb0zg3anr3322ar2m3f6y0zf5cqrwfdsb04p6pqvfpsy9wh", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.2.10/richdocuments-v8.2.10.tar.gz", - "version": "8.2.10", - "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": { - "sha256": "0knzz84ky8w1dvxrl61p63zrmalzg6b4b8syf5hx9ympr4ngpaza", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.9/spreed-v17.1.9.tar.gz", - "version": "17.1.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": [ - "agpl" - ] - }, - "tasks": { - "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", - "version": "0.15.0", - "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_nextcloud_notification": { - "sha256": "0qpg6i6iw6ldnryf0p56kd7fgs5vyckw9m6yjcf8r4j3mwfka273", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.9.0/twofactor_nextcloud_notification-v3.9.0.tar.gz", - "version": "3.9.0", - "description": "Allows using any of your logged in devices as second factor", - "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", - "licenses": [ - "agpl" - ] - }, - "twofactor_webauthn": { - "sha256": "0llxakzcdcy9hscyzw3na5zp1p57h03w5fmm0gs9g62k1b88k6kw", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.4.0/twofactor_webauthn-v1.4.0.tar.gz", - "version": "1.4.0", - "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] - }, - "unroundedcorners": { - "sha256": "16h8zg7k18r01yx2a72bn22nmvbafrs3ksyy23fbrnirzgwcaaqf", - "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.3/unroundedcorners-v1.1.3.tar.gz", - "version": "1.1.3", - "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" - ] - }, - "unsplash": { - "sha256": "1ya1h4nb9cyj1hdgb5l5isx7a43a7ri92cm0h8nwih20hi6a9wzx", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.1/unsplash.tar.gz", - "version": "2.2.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": { - "sha256": "0nl716c8jx6hhpkxjdpbldlnqhh6jsm6xx1zmcmvkzkdr9pjkggj", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.2/user_oidc-v5.0.2.tar.gz", - "version": "5.0.2", - "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", - "homepage": "https://github.com/nextcloud/user_oidc", - "licenses": [ - "agpl" - ] - }, - "user_saml": { - "sha256": "0cvlspkrcm3anxpz4lca464d66672slqq2laa7gn7sd1b9yl9nx8", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.7/user_saml-v5.2.7.tar.gz", - "version": "5.2.7", - "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/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json index 0a5c405e36..ed0f6fd9f2 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/28.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "01m78jfnqgvqj94v13bi6rj52sgwrp18zs4svgbdrci3lc7xqyp2", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.2/bookmarks-14.1.2.tar.gz", - "version": "14.1.2", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\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", + "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", + "version": "14.2.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" @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "06lbv04byc08zqfws2hbxqdg05d25sfps80y21xahzcrv74z4ngl", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.6/groupfolders-v16.0.6.tar.gz", - "version": "16.0.6", + "sha256": "17lhmj4ndxp7h0fxmxk3f3dwhs44mplxpyfb6nb5ia2dm8i858w1", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.7/groupfolders-v16.0.7.tar.gz", + "version": "16.0.7", "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.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -119,10 +119,20 @@ "agpl" ] }, + "integration_paperless": { + "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", + "version": "1.0.3", + "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": { - "sha256": "1q0ihgrb6sk0rizs45clqhjpmai2m2zislw6s1694j1zssz4jpqg", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.1/mail-v3.7.1.tar.gz", - "version": "3.7.1", + "sha256": "0bxbzibzsdqmd751759lg3vwhw9nyy5n37snijd083s1498sfqs5", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.2/mail-v3.7.2.tar.gz", + "version": "3.7.2", "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,9 +160,9 @@ ] }, "music": { - "sha256": "04dh6vzriiiqnn02pjbwn9rv0q427njbx558jl504jp91b8qd2wn", - "url": "https://github.com/owncloud/music/releases/download/v1.11.0/music_1.11.0_for_nextcloud.tar.gz", - "version": "1.11.0", + "sha256": "17anhb0zcky4fwmbj1czm536d7k8n03iwsn3dqnyq1b9c4bqyj4m", + "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\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": [ @@ -200,9 +210,9 @@ ] }, "polls": { - "sha256": "1crs6fks9ywywyi3pnji49dxnry5vpcmd1x29y8anyp32ji2a35r", - "url": "https://github.com/nextcloud/polls/releases/download/v7.0.3/polls.tar.gz", - "version": "7.0.3", + "sha256": "1s8ym7msl4cax69kr2piphgapllsva1vjh2xb7g03yb7z1hglhjs", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.2/polls.tar.gz", + "version": "7.1.2", "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": [ @@ -240,9 +250,9 @@ ] }, "richdocuments": { - "sha256": "1rpbzcxi6n656351rlx1gpg2nwz0z5i4107adls9fh1cdvj9vqs6", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.7/richdocuments-v8.3.7.tar.gz", - "version": "8.3.7", + "sha256": "0lxbdyvmwsrj9qsb3w3f6si6sydddb4p96rvhrsardq96pam3xwz", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.8/richdocuments-v8.3.8.tar.gz", + "version": "8.3.8", "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": [ @@ -300,9 +310,9 @@ ] }, "user_oidc": { - "sha256": "0nl716c8jx6hhpkxjdpbldlnqhh6jsm6xx1zmcmvkzkdr9pjkggj", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.2/user_oidc-v5.0.2.tar.gz", - "version": "5.0.2", + "sha256": "1qarpmwk66mz6mvif0cc4jb7wi4yv76flzwhyvmzxk0ahafpi8x1", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.3/user_oidc-v5.0.3.tar.gz", + "version": "5.0.3", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json index 7f7e7d91e9..a082acb744 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/29.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "01m78jfnqgvqj94v13bi6rj52sgwrp18zs4svgbdrci3lc7xqyp2", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.2/bookmarks-14.1.2.tar.gz", - "version": "14.1.2", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\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", + "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", + "version": "14.2.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" @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "1x765bd5qd88rpa786pvj74psc52zbivk73pxna6nmhn9v0pmpms", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.0/groupfolders-v17.0.0.tar.gz", - "version": "17.0.0", + "sha256": "0s0bsidghrj5k38vbw6xbp7jr57sqb3pn9n2gq24sdklhy81k882", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.1/groupfolders-v17.0.1.tar.gz", + "version": "17.0.1", "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.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -119,10 +119,20 @@ "agpl" ] }, + "integration_paperless": { + "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", + "version": "1.0.3", + "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": { - "sha256": "1q0ihgrb6sk0rizs45clqhjpmai2m2zislw6s1694j1zssz4jpqg", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.1/mail-v3.7.1.tar.gz", - "version": "3.7.1", + "sha256": "0bxbzibzsdqmd751759lg3vwhw9nyy5n37snijd083s1498sfqs5", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.2/mail-v3.7.2.tar.gz", + "version": "3.7.2", "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,9 +160,9 @@ ] }, "music": { - "sha256": "04dh6vzriiiqnn02pjbwn9rv0q427njbx558jl504jp91b8qd2wn", - "url": "https://github.com/owncloud/music/releases/download/v1.11.0/music_1.11.0_for_nextcloud.tar.gz", - "version": "1.11.0", + "sha256": "17anhb0zcky4fwmbj1czm536d7k8n03iwsn3dqnyq1b9c4bqyj4m", + "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\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": [ @@ -200,9 +210,9 @@ ] }, "polls": { - "sha256": "1crs6fks9ywywyi3pnji49dxnry5vpcmd1x29y8anyp32ji2a35r", - "url": "https://github.com/nextcloud/polls/releases/download/v7.0.3/polls.tar.gz", - "version": "7.0.3", + "sha256": "1s8ym7msl4cax69kr2piphgapllsva1vjh2xb7g03yb7z1hglhjs", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.2/polls.tar.gz", + "version": "7.1.2", "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": [ @@ -240,9 +250,9 @@ ] }, "richdocuments": { - "sha256": "1gbgygb7ymsg7gjb29r3caglsrimcrk7yn4kka5f8swv9b1k0qx6", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.2/richdocuments-v8.4.2.tar.gz", - "version": "8.4.2", + "sha256": "0x1x4x21sknih87gzqzmhxnvi1s1h4j70i4wsn7hnpdvc9j830vs", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.3/richdocuments-v8.4.3.tar.gz", + "version": "8.4.3", "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": [ @@ -250,9 +260,9 @@ ] }, "spreed": { - "sha256": "106y9mbnwga7pfhydrd8rjpcr89ir3fjrdn81xykyzqwrq29fxgs", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.1/spreed-v19.0.1.tar.gz", - "version": "19.0.1", + "sha256": "1ydd156cjhjydbjmzjm0bq0garxfgbppgd7q6bfz04y10yjyjkah", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.3/spreed-v19.0.3.tar.gz", + "version": "19.0.3", "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": [ @@ -300,9 +310,9 @@ ] }, "user_oidc": { - "sha256": "0nl716c8jx6hhpkxjdpbldlnqhh6jsm6xx1zmcmvkzkdr9pjkggj", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.2/user_oidc-v5.0.2.tar.gz", - "version": "5.0.2", + "sha256": "1qarpmwk66mz6mvif0cc4jb7wi4yv76flzwhyvmzxk0ahafpi8x1", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.3/user_oidc-v5.0.3.tar.gz", + "version": "5.0.3", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 3affc750f9..3118d4418c 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -13,6 +13,7 @@ , "groupfolders": "agpl3Plus" , "impersonate": "agpl3Plus" , "integration_openai": "agpl3Only" +, "integration_paperless": "agpl3Plus" , "mail": "agpl3Plus" , "maps": "agpl3Plus" , "memories": "agpl3Plus" diff --git a/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix index 3cf45118d5..33bc7d66fc 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.1.0.0"; + version = "7.1.0.2"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-QifZDjmveokTkEIkMF1ozcR5x4mW/JWuSzD+rtU4B1c="; + hash = "sha256-zhzEUp7zZrtBYRkbDpKgu89XDFSB+o08dduRDv/3cvY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index 57f0ed7c9f..24658a280c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-wTnVZ2C6edXy7+DV5w9Ny1Ry8yKQtahS2AIjFkaJhm8="; + hash = "sha256-LrlBudJLqFFOPHShl56Z5LcEZ9E5nPVxnheUuVkjOcQ="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-1Al7Dxw6EkGZpjmxQWbRU4uV0KT1emNI3YNGbiX87Yc="; + vendorHash = "sha256-7kwKz70Q2ulOgl5VZv26rraO1M/zGYgc3zMZur56mgA="; CGO_ENABLED = 0; @@ -41,7 +41,7 @@ buildGoModule rec { description = "Truly Open Source MongoDB alternative"; mainProgram = "ferretdb"; changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${version}"; - homepage = "https://www.ferretdb.io/"; + homepage = "https://www.ferretdb.com/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya noisersup julienmalka ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index a22283452d..f4b375a62c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.20.0"; + version = "5.21.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-IDIVdIQCcChx5RHG3/88Yvclh8ToDfcDv4VAhcQ20GY="; + hash = "sha256-NFGoUqmG8VArQqx0p8qDUgvbtRnYbk1MYPSQ5CUFexg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Highly scalable, robust (fully ACID) native graph database"; homepage = "https://neo4j.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ jonringer offline ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix index 0cfe31bc8e..f201e34e85 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-cvfacdMPb/w/muaKXm6SQMAJLSjxP+D9/YmpgsYAYEw="; + hash = "sha256-S6i6XLxFpIxYAlxCu+MAznMLkBWvp8QVxged+rYCWT0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/base64.nix b/third_party/nixpkgs/pkgs/servers/redpanda/base64.nix deleted file mode 100644 index 305456c55c..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/base64.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -}: -let - pname = "base64"; - version = "0.5.0"; -in -clangStdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { - owner = "aklomp"; - repo = "base64"; - rev = "v${version}"; - sha256 = "sha256-2HNI9ycT9f+NLwLElEuR61qmTguOsI+kNxv01ipxSqQ="; - }; - nativeBuildInputs = [ cmake ]; - meta = with lib; { - description = "Fast Base64 stream encoder/decoder in C99, with SIMD acceleration"; - license = licenses.bsd2; - homepage = "https://github.com/aklomp/base64"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index b3d2fe1e69..6f48af42c9 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -1,5 +1,4 @@ { buildGoModule -, callPackage , doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. , fetchFromGitHub , installShellFiles @@ -7,14 +6,13 @@ , stdenv }: let - version = "24.1.8"; + version = "24.1.9"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-Eemo1NhRa6CX+fgtNT22zoQqN8Vrrl8mkqhy4zmhJHo="; + sha256 = "sha256-/A6BzhCdN8e7mV/Tp9TYfOmSAjmaa4S3FNCko4G9Vgs="; }; - server = callPackage ./server.nix { inherit src version; }; in buildGoModule rec { pname = "redpanda-rpk"; @@ -38,10 +36,6 @@ buildGoModule rec { done ''; - passthru = { - inherit server; - }; - meta = with lib; { description = "Redpanda client"; homepage = "https://redpanda.com/"; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/hdr-histogram.nix b/third_party/nixpkgs/pkgs/servers/redpanda/hdr-histogram.nix deleted file mode 100644 index 91000649e1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/hdr-histogram.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -, zlib -}: -let - pname = "HdrHistogram_c"; - version = "0.11.5"; -in -clangStdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { - owner = "HdrHistogram"; - repo = "HdrHistogram_c"; - rev = version; - sha256 = "sha256-29if+0H8wdpQBN48lt0ylGgtUCv/tJYZnG5LzcIqXDs="; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; - meta = with lib; { - description = "C port of the HdrHistogram"; - license = licenses.bsd2; - homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/rapidjson.nix b/third_party/nixpkgs/pkgs/servers/redpanda/rapidjson.nix deleted file mode 100644 index 99ada8c05f..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/rapidjson.nix +++ /dev/null @@ -1,32 +0,0 @@ -# rapidjson used in nixpkgs is too old. Although it is technically a latest release, it was made in 2016. -# Redpanda uses its own version -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -, pkg-config -}: - -clangStdenv.mkDerivation rec { - pname = "rapidjson"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "redpanda-data"; - repo = "rapidjson"; - rev = "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d"; - sha256 = "sha256-wggyCL5uEsnJDxkYAUsXOjoO1MNQBGB05E6aSpsNcl0="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - doCheck = false; - - meta = with lib; { - description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; - homepage = "http://rapidjson.org/"; - maintainers = with maintainers; [ avakhrenev ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/redpanda.patch b/third_party/nixpkgs/pkgs/servers/redpanda/redpanda.patch deleted file mode 100644 index c3ee76d3c9..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/redpanda.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/cmake/main.cmake b/cmake/main.cmake -index 8c60c4214..194f33a21 100644 ---- a/cmake/main.cmake -+++ b/cmake/main.cmake -@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_UNITY_BUILD_BATCH_SIZE 10) - set(CMAKE_CXX_EXTENSIONS OFF) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) --list(APPEND BASE_LD_FLAGS_LIST -- -L${REDPANDA_DEPS_INSTALL_DIR}/lib -- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64 -- -fuse-ld=lld) --set(PKG_CONFIG_PATH_LIST -- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig -- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig -- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig -- ) - - list(APPEND BASE_CXX_FLAGS_LIST -fPIC) - list(APPEND BASE_C_FLAGS_LIST -fPIC) -diff --git a/cmake/testing.cmake b/cmake/testing.cmake -index 7f149dc82..7c57aa3dd 100644 ---- a/cmake/testing.cmake -+++ b/cmake/testing.cmake -@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}") - message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}") - - function (rp_test) -+ return() - set(options - INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST) - set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eecd145ed..b9efa89b5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -5,4 +5,5 @@ find_package(Boost REQUIRED - unit_test_framework) - find_package(absl REQUIRED) - add_subdirectory(v) --add_subdirectory(go/kreq-gen) -+# Don't build kafka-request-generator, it is needed only for tests -+# add_subdirectory(go/kreq-gen) -diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt -index 075da485e..af7ede2bc 100644 ---- a/src/v/CMakeLists.txt -+++ b/src/v/CMakeLists.txt -@@ -58,7 +58,9 @@ else() - if(${ENABLE_GIT_HASH}) - message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'") - endif() -- set(GIT_VER "no_version") -+ if(NOT GIT_VER) -+ set(GIT_VER "no_version") -+ endif() - endif() - - if(${ENABLE_GIT_HASH}) -@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH}) - set(GIT_CLEAN_DIRTY "") - endif() - else() -- set(GIT_SHA1 "000") -- set(GIT_CLEAN_DIRTY "-dev") -+ if(NOT GIT_SHA1) -+ set(GIT_SHA1 "000") -+ endif() -+ if(NOT GIT_CLEAN_DIRTY) -+ set(GIT_CLEAN_DIRTY "-dev") -+ endif() - endif() - - configure_file(version.h.in version.h @ONLY) diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/seastar-fixes.patch b/third_party/nixpkgs/pkgs/servers/redpanda/seastar-fixes.patch deleted file mode 100644 index c6b12b88c1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/seastar-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/seastar/core/std-coroutine.hh b/include/seastar/core/std-coroutine.hh -index ea364bee..57474529 100644 ---- a/include/seastar/core/std-coroutine.hh -+++ b/include/seastar/core/std-coroutine.hh -@@ -87,7 +87,7 @@ class coroutine_handle { - - explicit operator bool() const noexcept { return _pointer; } - -- static coroutine_handle from_address(void* ptr) noexcept { -+ static constexpr coroutine_handle from_address(void* ptr) noexcept { - coroutine_handle hndl; - hndl._pointer = ptr; - return hndl; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/seastar.nix b/third_party/nixpkgs/pkgs/servers/redpanda/seastar.nix deleted file mode 100644 index ac0f7b2d6b..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/seastar.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ boost175 -, c-ares -, cmake -, cryptopp -, fetchFromGitHub -, fmt_8 -, gnutls -, hwloc -, lib -, libsystemtap -, libtasn1 -, liburing -, libxfs -, lksctp-tools -, llvmPackages_14 -, lz4 -, ninja -, numactl -, openssl -, pkg-config -, python3 -, ragel -, valgrind -, yaml-cpp -}: -let - pname = "seastar"; - version = "22.11.0"; -in -llvmPackages_14.stdenv.mkDerivation { - inherit pname version; - strictDeps = true; - src = fetchFromGitHub { - owner = "redpanda-data"; - repo = "seastar"; - rev = "30d3a28bde08d2228b4e560c173b89fdd94c3f05"; - sha256 = "sha256-Xzu7AJMkvE++BGEqluod3fwMEIpDnbCczmlEad0/4v4="; - }; - nativeBuildInputs = [ - cmake - ninja - openssl - pkg-config - python3 - ragel - ]; - buildInputs = [ - libsystemtap - libxfs - ]; - propagatedBuildInputs = [ - boost175 - c-ares - gnutls - cryptopp - fmt_8 - hwloc - libtasn1 - liburing - lksctp-tools - lz4 - numactl - valgrind - yaml-cpp - ]; - patches = [ - ./seastar-fixes.patch - ]; - postPatch = '' - patchShebangs ./scripts/seastar-json2code.py - ''; - cmakeFlags = [ - "-DSeastar_EXCLUDE_DEMOS_FROM_ALL=ON" - "-DSeastar_EXCLUDE_TESTS_FROM_ALL=ON" - ]; - doCheck = false; - meta = with lib; { - description = "High performance server-side application framework"; - license = licenses.asl20; - homepage = "https://seastar.io/"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/server.nix b/third_party/nixpkgs/pkgs/servers/redpanda/server.nix deleted file mode 100644 index 45b005c792..0000000000 --- a/third_party/nixpkgs/pkgs/servers/redpanda/server.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ abseil-cpp_202206 -, avro-cpp -, callPackage -, ccache -, cmake -, crc32c -, croaring -, ctre -, curl -, dpdk -, git -, lib -, llvmPackages_14 -, llvm_14 -, ninja -, p11-kit -, pkg-config -, procps -, protobuf_21 -, python3 -, snappy -, src -, unzip -, version -, writeShellScriptBin -, xxHash -, zip -, zstd -}: -let - pname = "redpanda"; - pythonPackages = p: with p; [ jinja2 ]; - seastar = callPackage ./seastar.nix { }; - base64 = callPackage ./base64.nix { }; - hdr-histogram = callPackage ./hdr-histogram.nix { }; - kafka-codegen-venv = python3.withPackages (ps: [ - ps.jinja2 - ps.jsonschema - ]); - rapidjson = callPackage ./rapidjson.nix { }; -in -llvmPackages_14.stdenv.mkDerivation rec { - inherit pname version src; - - preConfigure = '' - # setup sccache - export CCACHE_DIR=$TMPDIR/sccache-redpanda - mkdir -p $CCACHE_DIR - ''; - patches = [ - ./redpanda.patch - ]; - postPatch = '' - # Fix 'error: use of undeclared identifier 'roaring'; did you mean 'Roaring - # qualified reference to 'Roaring' is a constructor name rather than a type in this context' - substituteInPlace \ - ./src/v/storage/compacted_offset_list.h \ - ./src/v/storage/compaction_reducers.cc \ - ./src/v/storage/compaction_reducers.h \ - ./src/v/storage/segment_utils.h \ - ./src/v/storage/segment_utils.cc \ - --replace 'roaring::Roaring' 'Roaring' - - patchShebangs ./src/v/rpc/rpc_compiler.py - ''; - - doCheck = false; - - nativeBuildInputs = [ - (python3.withPackages pythonPackages) - (writeShellScriptBin "kafka-codegen-venv" "exec -a $0 ${kafka-codegen-venv}/bin/python3 $@") - ccache - cmake - curl - git - llvm_14 - ninja - pkg-config - procps - seastar - unzip - zip - ]; - - cmakeFlags = [ - "-DREDPANDA_DEPS_SKIP_BUILD=ON" - "-DRP_ENABLE_TESTS=OFF" - "-Wno-dev" - "-DGIT_VER=${version}" - "-DGIT_CLEAN_DIRTY=\"\"" - ]; - - buildInputs = [ - abseil-cpp_202206 - avro-cpp - base64 - crc32c - croaring - ctre - dpdk - hdr-histogram - p11-kit - protobuf_21 - rapidjson - seastar - snappy - xxHash - zstd - ]; - - meta = with lib; { - broken = true; - description = "Kafka-compatible streaming platform"; - license = licenses.bsl11; - longDescription = '' - Redpanda is a Kafka-compatible streaming data platform that is - proven to be 10x faster and 6x lower in total costs. It is also JVM-free, - ZooKeeper-free, Jepsen-tested and source available. - ''; - homepage = "https://redpanda.com/"; - maintainers = with maintainers; [ avakhrenev happysalada ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index d6fee8dc56..368bca558c 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1413"; + version = "2.0-1432"; 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-VoTJu5+zuFFknDolGJ/69e1i6B4vfR9ev7sAKhfeRlU="; + hash = "sha256-h0Ly5S8ML29RtaZOpe0k4U/R0coClHHGUZyu5d1PqzQ="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix b/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix index fe6ce6f3a5..fa5b4a30c6 100644 --- a/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtrtr/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rtrtr"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-meZ24qIug2Zkw6PcB697CRuujVRIUuSrgugwnBM9gj8="; + hash = "sha256-P9bofTmDpnNCVQAGeq9J2XqfNeula8nL1KoBIHMZNWg="; }; - cargoSha256 = "sha256-9wUfgkiQn2Du5UNBOy/+NZkFwqHAQoyqj8xQhIljKFY="; + cargoHash = "sha256-ToJLE4nqgTqg5D4Qh2zi+wjmcdwDo0aupoDwKJCTwnM="; buildInputs = lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix index fb9139ec6e..1ee13f3989 100644 --- a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-NHLt23GDdtq1DliMByXN52jnKGZApdngp04MTz7F7HY="; + hash = "sha256-AUuquYXRwI4JvEiUdx/l3Tk/kxENrXG1RtzBzrsrZyg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock index 3daf47e49f..65ed8a715a 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" dependencies = [ "actix-http", "actix-service", @@ -109,9 +109,9 @@ dependencies = [ [[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", @@ -125,6 +125,7 @@ dependencies = [ "log", "memchr", "mime", + "rand 0.8.5", "serde", "serde_json", "serde_plain", @@ -230,9 +231,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" +checksum = "5d6316df3fa569627c98b12557a8b6ff0674e5be4bb9b5e4ae2550ddb4964ed6" dependencies = [ "actix-codec", "actix-http", @@ -272,14 +273,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", ] [[package]] @@ -331,6 +332,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aes" version = "0.8.3" @@ -469,11 +476,11 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api" -version = "1.9.4" +version = "1.9.6" dependencies = [ "chrono", "common", - "itertools 0.12.1", + "itertools 0.13.0", "parking_lot", "prost 0.11.9", "prost-build 0.11.9", @@ -572,6 +579,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[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" @@ -600,7 +618,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower", "tower-layer", "tower-service", @@ -853,9 +871,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -1000,31 +1018,61 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.2", + "once_cell", + "strsim 0.10.0", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", - "clap_derive", + "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", + "clap_lex 0.7.0", "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "clap_derive" +version = "4.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1032,6 +1080,15 @@ dependencies = [ "syn 2.0.48", ] +[[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 = "clap_lex" version = "0.7.0" @@ -1077,7 +1134,7 @@ dependencies = [ "indicatif", "io", "issues", - "itertools 0.12.1", + "itertools 0.13.0", "lazy_static", "log", "merge", @@ -1341,7 +1398,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap", + "clap 4.5.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1547,7 +1604,7 @@ dependencies = [ "anyhow", "flate2", "indicatif", - "reqwest", + "reqwest 0.12.5", ] [[package]] @@ -1589,6 +1646,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "dlv-list" version = "0.5.2" @@ -1880,9 +1948,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ "rustix 0.38.31", "windows-sys 0.52.0", @@ -2286,6 +2354,15 @@ 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.3" @@ -2443,19 +2520,35 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.9", + "hyper 0.14.26", + "rustls 0.21.11", + "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.0.0", "hyper 1.2.0", "hyper-util", - "rustls 0.22.4", + "rustls 0.23.10", + "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tower-service", + "webpki-roots 0.26.1", ] [[package]] @@ -2514,6 +2607,124 @@ dependencies = [ "cxx-build", ] +[[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.48", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2532,12 +2743,14 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -2647,7 +2860,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -2685,7 +2898,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "io-lifetimes", "rustix 0.37.27", "windows-sys 0.45.0", @@ -2729,6 +2942,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.5" @@ -2768,6 +2990,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + [[package]] name = "json5" version = "0.4.1" @@ -2818,6 +3046,26 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libflate" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +dependencies = [ + "rle-decode-fast", +] + [[package]] name = "libloading" version = "0.7.4" @@ -3096,9 +3344,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "local-channel" @@ -3312,6 +3560,16 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "names" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +dependencies = [ + "clap 3.2.25", + "rand 0.8.5", +] + [[package]] name = "nias" version = "0.5.0" @@ -3440,7 +3698,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", ] @@ -3478,7 +3736,7 @@ dependencies = [ "percent-encoding", "quick-xml 0.31.0", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "ring 0.17.5", "serde", "serde_json", @@ -3535,6 +3793,12 @@ dependencies = [ "hashbrown 0.13.2", ] +[[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" @@ -3855,6 +4119,15 @@ dependencies = [ "syn 2.0.48", ] +[[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-macro-error" version = "1.0.4" @@ -4140,9 +4413,39 @@ dependencies = [ "pulldown-cmark", ] +[[package]] +name = "pyroscope" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac8a53ce01af1087eaeee6ce7c4fbf50ea4040ab1825c0115c4bafa039644ba9" +dependencies = [ + "json", + "libc", + "libflate", + "log", + "names", + "prost 0.11.9", + "reqwest 0.11.27", + "thiserror", + "url", + "winapi", +] + +[[package]] +name = "pyroscope_pprofrs" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f010b2a981a7f8449a650f25f309e520b5206ea2d89512dcb146aaa5518ff4" +dependencies = [ + "log", + "pprof", + "pyroscope", + "thiserror", +] + [[package]] name = "qdrant" -version = "1.9.4" +version = "1.9.6" dependencies = [ "actix-cors", "actix-files", @@ -4154,7 +4457,7 @@ dependencies = [ "api", "cancel", "chrono", - "clap", + "clap 4.5.7", "collection", "colored", "common", @@ -4164,19 +4467,21 @@ dependencies = [ "futures", "futures-util", "issues", - "itertools 0.12.1", + "itertools 0.13.0", "jsonwebtoken", "log", "memory", "parking_lot", "prometheus", "prost 0.11.9", + "pyroscope", + "pyroscope_pprofrs", "raft", "raft-proto", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "rstack-self", - "rustls 0.23.8", + "rustls 0.23.10", "rustls-pemfile 2.1.2", "rustls-pki-types", "rusty-hook", @@ -4211,9 +4516,10 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#14f42f944358b4e95c482892dc4ead019809a448" +source = "git+https://github.com/qdrant/quantization.git#0caf67d96f022a792bda2e41fa878ba1e113113f" dependencies = [ "cc", + "num-traits", "permutation_iterator", "rand 0.8.5", "rayon", @@ -4246,6 +4552,53 @@ dependencies = [ "serde", ] +[[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 0.23.10", + "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 0.17.5", + "rustc-hash", + "rustls 0.23.10", + "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.5", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.35" @@ -4468,9 +4821,50 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", + "hyper-rustls 0.24.2", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.11", + "rustls-pemfile 1.0.3", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "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.0", "bytes", @@ -4482,7 +4876,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.2.0", - "hyper-rustls", + "hyper-rustls 0.27.2", "hyper-util", "ipnet", "js-sys", @@ -4491,16 +4885,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.4", + "quinn", + "rustls 0.23.10", "rustls-native-certs", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -4508,8 +4903,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] @@ -4556,6 +4951,12 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + [[package]] name = "rmp" version = "0.8.14" @@ -4646,9 +5047,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures", "futures-timer", @@ -4658,12 +5059,13 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -4759,9 +5161,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.8" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", "once_cell", @@ -4908,9 +5310,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0218ceea14babe24a4a5836f86ade86c1effbc198164e619194cb5069187e29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "chrono", "dyn-clone", @@ -4925,9 +5327,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed5a1ccce8ff962e31a165d41f6e2a2dd1245099dc4d594f5574a86cd90f4d3" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", @@ -4977,9 +5379,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "sealed_test" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a608d94641cc17fe203b102db2ae86d47a236630192f0244ddbbbb0044c0272" +checksum = "2a1867f8f005bd7fb73c367e2e45dd628417906a2ca27597fe59cbf04279a222" dependencies = [ "fs_extra", "rusty-forkfork", @@ -4989,12 +5391,12 @@ dependencies = [ [[package]] name = "sealed_test_derive" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b672e005ae58fef5da619d90b9f1c5b44b061890f4a371b3c96257a8a15e697" +checksum = "77253fb2d4451418d07025826028bcb96ee42d3e58859689a70ce62908009db6" dependencies = [ "quote", - "syn 1.0.107", + "syn 2.0.48", ] [[package]] @@ -5050,7 +5452,7 @@ dependencies = [ "io-uring", "is_sorted", "issues", - "itertools 0.12.1", + "itertools 0.13.0", "log", "macro_rules_attribute", "memmap2 0.9.4", @@ -5074,11 +5476,13 @@ dependencies = [ "schemars", "seahash", "segment", + "semver", "serde", "serde-untagged", "serde-value", "serde_cbor", "serde_json", + "serde_variant", "smallvec", "smol_str", "sparse", @@ -5105,9 +5509,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -5145,9 +5549,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -5219,6 +5623,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_variant" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0068df419f9d9b6488fdded3f1c818522cdea328e02ce9d9f147380265a432" +dependencies = [ + "serde", +] + [[package]] name = "serial_test" version = "3.1.1" @@ -5426,12 +5839,15 @@ dependencies = [ "common", "criterion", "dataset", + "generic-tests", + "half 2.4.1", "indicatif", "io", - "itertools 0.12.1", + "itertools 0.13.0", "log", "memmap2 0.9.4", "memory", + "num-traits", "ordered-float 4.2.0", "parking_lot", "pprof", @@ -5485,7 +5901,7 @@ dependencies = [ "http 0.2.9", "io", "issues", - "itertools 0.12.1", + "itertools 0.13.0", "log", "memory", "parking_lot", @@ -5494,7 +5910,7 @@ dependencies = [ "protobuf", "raft", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "schemars", "segment", "serde", @@ -5542,11 +5958,11 @@ dependencies = [ [[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", @@ -5610,6 +6026,23 @@ 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.48", +] + [[package]] name = "sys-info" version = "0.9.1" @@ -5635,6 +6068,27 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -5643,9 +6097,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", @@ -5683,6 +6137,12 @@ dependencies = [ "winapi", ] +[[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" @@ -5795,6 +6255,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" @@ -5822,9 +6292,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[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", @@ -5852,9 +6322,9 @@ 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", @@ -5871,24 +6341,13 @@ dependencies = [ "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-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.8", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -6285,21 +6744,33 @@ dependencies = [ "rustls-pki-types", "rustls-webpki 0.102.4", "url", - "webpki-roots", + "webpki-roots 0.26.1", ] [[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 0.5.0", + "idna 1.0.0", "percent-encoding", "serde", ] +[[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.1" @@ -6531,6 +7002,12 @@ dependencies = [ "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" @@ -6842,6 +7319,16 @@ 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" @@ -6852,6 +7339,18 @@ dependencies = [ "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 = "wyz" version = "0.5.1" @@ -6863,11 +7362,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys 0.4.13", + "rustix 0.38.31", ] [[package]] @@ -6885,6 +7386,30 @@ dependencies = [ "linked-hash-map", ] +[[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.48", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.31" @@ -6910,6 +7435,21 @@ name = "zerofrom" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +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.48", + "synstructure", +] [[package]] name = "zeroize" @@ -6919,11 +7459,24 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +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.48", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix index 79c541145b..cb8ef90f20 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix @@ -13,19 +13,19 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jpZJtnQx8r9j12GObXxcpzH0i1rJe46qYodLhWlWLMY="; + sha256 = "sha256-fRQZmCHbWC5G6kS4+9KWgI4Qc6JnX3aBS4wJJgTWHlk="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-BofK1X06efESoxVJmlCY5D3toFmo2ZkKNz11ot2imIs="; + "quantization-0.1.0" = "sha256-xqcwn9NmCKEulh4CTV6bwhPOlDgQt8EZaQbqdDjxgNA="; "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; "wal-0.1.2" = "sha256-YjOXYg8dnYsb+Zl6xUkAccjZZn3tyf3fR/kWTfUjlgg="; }; diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix index 8e447e16be..8cd90febb0 100644 --- a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.25.2"; + version = "1.25.5"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-fN0tlu6zhSy6SiFX+f38TL8ciJHYfKZXVYeJp2HgRIA="; + hash = "sha256-tkTsZ9iDZdQARhkEUyRYm77ebUCwNWgDdDEjLj7LOgY="; }; - vendorHash = "sha256-4QSc4dU1bEpKpiG7FwSq/BbnFL94DqgjQo6zN67d8Sw="; + vendorHash = "sha256-40O6MF1Tk9ZhGVLcKGzoUTaUFjKuXdpIHbB1GuRgyL8="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix index c57ef45b3a..3a3b687459 100644 --- a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-LMZAEr0PVTpn4YY22Lz0IuJfRzvADybNExBrgb1qqQ8="; + hash = "sha256-76P4njY/Wb9l4LG+sZwiwQVrvfXCtAELju30GLi7kBE="; }; - vendorHash = "sha256-fhS6uq0uEtSBeWFjh4/HqXDcAsYyvp9jtxcDr+s+uAo="; + vendorHash = "sha256-gBb+qpNFSFhCOYLxXkz3xmyx+3PvyOwLNqjT9zZQuc8="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index d66b3cd272..fa90943d1c 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.36.3"; + version = "2.36.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-+8bw6pFbogM1955OO/w21KnJa+JlAALTRc2m1QAXObE="; + sha256 = "sha256-pKOYyEiVszbZM1iDe8e6YgaNPB6MoiAc24e06Nyeeb0="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix index efe7728904..2e4e97b7a0 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-+FXFHjGWKcIt3urDokk5PF24JPVs21RbQtpcYz2midM="; + hash = "sha256-TavFN9gWetK1qIP2sBE1zT/dFW3q2j8jTR1vDWiJBHM="; }; - vendorHash = "sha256-Z6j4w4/anfK0ln2MvgnwZFoe8BA5jVHG3g9m2TynmmE="; + vendorHash = "sha256-ko0SbpFHpy9a2GhQUeCwZyWxD7yHBnlQLDxk5hM6aG8="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 7f411241e7..dd8a8005a5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.39.4"; + version = "1.41.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-8xds2FpNUfCfpekSuGKqY2Q6ULvpcfbuMC2/1QU5VEQ="; + sha256 = "sha256-IeLG2IRHGrx5F3tIcvilhgC9BUFHpIpbzTo6vdQj+ZE="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-0vAoACwwBhbK/GvxKE+1aZGPM0DsHyrhDOSzAgHlWAI="; + vendorHash = "sha256-bqTw4k2WWE7vsp36Ldexnp/eoFOBUL5po8lZzsbv7D4="; proxyVendor = true; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index 598be78140..6de05cba60 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.36"; + version = "8.0.37"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0="; + hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix index a76a9968cb..ec681de8ff 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.24.10"; + version = "8.26.2"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cLqCX9ulzsmNFkyaExYuFNOD78TMiNdKEgoJV89Ipxw="; + sha256 = "sha256-GGqnhsEvv8pnaRmJO+IX64VNQVnBaGZcUKMOiW/PJaQ="; }; - vendorHash = "sha256-9UFDpdWK/kQuko3AaWXBiDCa+Wd1hNmPk5rDM9ugoTw="; + vendorHash = "sha256-x1W2niLqhAcroh67cssDuuiJA3Pd5W4Wkh12uKqSfDI="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix index 0c633bb408..affa9d6f3f 100644 --- a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix @@ -42,13 +42,13 @@ in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-tb3MwH6d/xe05QiBu11iZYICp8eTkKLuQiISoY0zKTE="; + hash = "sha256-1VP5yjyQNBvaAIRhrv1fntZFqSUIAZm5X0J8xQ2HJuM="; }; postPatch = '' @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-/k9nNxZxyV12pyRep6cTsUoEQobb9sWKnXxQmXmVAl0="; + cargoHash = "sha256-lfiRnaTF1aLs2QU+gv7J48rZSHJdtt8U81odQ1o74R4="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 95e8d28f9a..198dc671d0 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.2"; + version = "2.14.3"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IMEjUUIdt4NwufXhQLZl8yxajKOfK8AvWBWxlahZ8Xs="; + sha256 = "sha256-9/KtlthI71qrf1QlJ0/WI+H401U+6bnrO1qfQO5TTUU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix b/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix index 49915ee9f4..34d787b847 100644 --- a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "unifiedpush-common-proxies"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "unifiedpush"; repo = "common-proxies"; rev = "v${version}"; - sha256 = "sha256-nKmWYBB/1akcISWxNgZxb15ROVQBcBbTn0HF+WZSb58="; + sha256 = "sha256-pMzKK18FZCqJ86nqXfOT7tKCqIw6P0ioxRUi72aef0A="; }; vendorHash = "sha256-wVZR/h0AtwZ1eo7EoRKNzaS2Wp0X01e2u3Ugmsnj644="; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix index cc47813814..ce1f17dc0a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.3"; + version = "3.4"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XQ8nr9z9Yjwr1irExIgYiGX2knMXX701i6BwvXsVP+E="; + sha256 = "sha256-hiuw7XfCDy+9fzuQMaeN9+XsENeBI1RNXy8IM1HIFhI="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix index 964baf96f8..43f3f399b4 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.41.1"; + version = "1.42.1"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-TguqlTuF6U0xBAyyUSCrxgb6hpsuMxJr37t/xhPoxLI="; + hash = "sha256-7IevlaNd0Jw01S4CeVZSoDCrcpVeQx8IynIqc3N+ulM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix index 95e11dbdb5..6033db65bf 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.13"; + version = "0.5.16"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zFsxX7pZc8Hm8XcKWZK5zE3XAYmFPT0IJKD0+zazaeI="; + sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo="; }; - cargoHash = "sha256-NjNfMyNEliyJQuwWJ/owyKOz+P5gT8Ov0w298I6A/Bk="; + cargoHash = "sha256-lMnJyiKhO7fGrjHkyZjheN0w7GgVs7Jnszw1KXo7vTg="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix index 8a9fc7973f..98b084ad50 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix @@ -1,10 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, installShellFiles, stdenv }: buildGoModule rec { pname = "shiori"; - version = "1.5.5"; + version = "1.7.0"; - vendorHash = "sha256-suWdtqf5IZntEVD+NHGD6RsL1tjcGH9vh5skISW+aCc="; + vendorHash = "sha256-fakRqgoEcdzw9WZuubaxfGfvVrMvb8gV/IwPikMnfRQ="; doCheck = false; @@ -12,18 +12,24 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kGPvCYvLLixEH9qih/F3StUyGPqlKukTWLSw41+Mq8E="; + sha256 = "sha256-5+hTtvBnj3Nh5HitReVkLift9LTiMYVuuYx5EirN0SA="; }; - passthru.tests = { - smoke-test = nixosTests.shiori; - }; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + installShellCompletion --cmd shiori \ + --bash <($out/bin/shiori completion bash) \ + --fish <($out/bin/shiori completion fish) \ + --zsh <($out/bin/shiori completion zsh) + ''; + + passthru.tests.smoke-test = nixosTests.shiori; meta = with lib; { description = "Simple bookmark manager built with Go"; mainProgram = "shiori"; homepage = "https://github.com/go-shiori/shiori"; license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ minijackson CaptainJawZ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 717619ffba..aab023ce4b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -9,7 +9,7 @@ hash = "sha256-aLOO/XgjI3d/+1BpHDT2pGR697oceghjzOId1MjC+wQ="; }; wordpress6_5 = { - version = "6.5.4"; - hash = "sha256-HsgnmdN8MxN0F5v3BDFQzxvX2AgC/Ke0+Nz01Fkty7Q="; + version = "6.5.5"; + hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index 11913a39e0..d8d118f307 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,5 @@ { egl-wayland +, bash , libepoxy , fetchurl , fetchpatch @@ -73,6 +74,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace os/utils.c \ + --replace-fail '/bin/sh' '${lib.getExe' bash "sh"}' + ''; + depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.nix b/third_party/nixpkgs/pkgs/shells/bash/5.nix index 2579853311..a757834a4f 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/5.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/5.nix @@ -80,6 +80,10 @@ stdenv.mkDerivation rec { "bash_cv_job_control_missing=nomissing" "bash_cv_sys_named_pipes=nomissing" "bash_cv_getcwd_malloc=yes" + # This check cannot be performed when cross compiling. The "yes" + # default is fine for static linking on Linux (weak symbols?) but + # not with OpenBSD, when it does clash with the regular `getenv`. + "bash_cv_getenv_redef=${if !(with stdenv.hostPlatform; isStatic && isOpenBSD) then "yes" else "no"}" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "--without-libintl-prefix" "--without-libiconv-prefix" diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 3bdef89e72..9e65dcd7c2 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ philiptaron ]; }; } diff --git a/third_party/nixpkgs/pkgs/shells/carapace/default.nix b/third_party/nixpkgs/pkgs/shells/carapace/default.nix index 12c88764e5..37b3d67559 100644 --- a/third_party/nixpkgs/pkgs/shells/carapace/default.nix +++ b/third_party/nixpkgs/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-nmih6kyVaYLVOG+EEaCUYkVRAXPXXUdPchv6JFzlU+U="; + hash = "sha256-ht0zeeePU2fPMP7/Q0K2VKUudVCa4T94sESJCxix04M="; }; - vendorHash = "sha256-QG+50wqYYpASzFv8Y3rpuyahW/lTV8Kz+v3rDt1kAN4="; + vendorHash = "sha256-XDX59HFf0yMEy9D5nQLZk1LeKrBcgC8M5kUyGiy29Ak="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/shells/hishtory/default.nix b/third_party/nixpkgs/pkgs/shells/hishtory/default.nix index 83b902c2e9..d7875fc7c0 100644 --- a/third_party/nixpkgs/pkgs/shells/hishtory/default.nix +++ b/third_party/nixpkgs/pkgs/shells/hishtory/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hishtory"; - version = "0.295"; + version = "0.297"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-f9iVKHrgq6whE1s5Q2NXSf1qYsV5WUq4frHUoX94cMs="; + hash = "sha256-qc+TmExj7x7bH5XzppVpwMt7oSK8CtBM/tHAXs4rrlE="; }; vendorHash = "sha256-zTwZ/sMhQdlf7RYfR2/K/m08U1Il0VQmYFyNNiYsWhc="; diff --git a/third_party/nixpkgs/pkgs/shells/murex/default.nix b/third_party/nixpkgs/pkgs/shells/murex/default.nix index b6a802b8c8..723cc2ae51 100644 --- a/third_party/nixpkgs/pkgs/shells/murex/default.nix +++ b/third_party/nixpkgs/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "6.0.1000"; + version = "6.1.8300"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-biwwNuCUgBNV//4/PYKf/n4HA69uiBEYFWVwspI1GG8="; + sha256 = "sha256-16eaPxmTauuttpjHUSQlBu/d/S3CWKgQYttqQWp0lkU="; }; - vendorHash = "sha256-qOItRqCIxoHigufI6b7j2VdBDo50qGDe+LAaccgDh5w="; + vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index e0a6994381..34bdab129b 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -13,9 +13,6 @@ , Security , nghttp2 , libgit2 -# string interpolation dependends on a date that is erroring out -# this will be fixed in releases after 0.90.1 -, doCheck ? false , withDefaultFeatures ? true , additionalFeatures ? (p: p) , testers @@ -24,7 +21,7 @@ }: let - version = "0.94.1"; + version = "0.95.0"; in rustPlatform.buildRustPackage { @@ -35,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-uwtmSyNJJUtaFrBd9W89ZQpWzBOswOLWTevkPlg6Ano="; + hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ="; }; - cargoHash = "sha256-4caqvbNxXRZksQrySydPlzn9S6gr2xPLFLSEcAEGnI8="; + cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] @@ -52,12 +49,19 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - inherit doCheck; - checkPhase = '' runHook preCheck - echo "Running cargo test" - HOME=$(mktemp -d) cargo test + ( + # The skipped tests all fail in the sandbox because in the nushell test playground, + # the tmp $HOME is not set, so nu falls back to looking up the passwd dir of the build + # user (/var/empty). The assertions however do respect the set $HOME. + set -x + HOME=$(mktemp -d) cargo test -j $NIX_BUILD_CORES --offline -- \ + --test-threads=$NIX_BUILD_CORES \ + --skip=repl::test_config_path::test_default_config_path \ + --skip=repl::test_config_path::test_xdg_config_bad \ + --skip=repl::test_config_path::test_xdg_config_empty + ) runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix index 47d29b44ac..e270a895c4 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-16"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "92f20ff2827b1afb3d06011bc0609a0212c53993"; - hash = "sha256-ZYrlX8Kg9VD5/eUctesAXQlBcVPiOZ3W9WCpBkByrpA="; + rev = "61a805eb06f27dfb4651877ae4e0fd85e2b9f1b7"; + hash = "sha256-ZcpcxRKtx2lS39c09txLGysRkLq6dNyy+9aZNrfGcT0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index 80d29c4dca..a4e3b5dfc4 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-r5r+LdG6isZiKzwaZM/RIzQnZwrVBDCbdM1SMbvVU0E="; + cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index 7a937b33aa..f1f59e66e2 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-ENDDkEpUp+3a0Numb7+McVP04VtSZaU4pbu4uEFT9Jc="; + cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix index d1bda99aca..f014c4a939 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-GkVX12MEHFP4g183zUzOUn4MNeTEBEpB+D5s0OXa4nc="; + cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix index 0473b291af..f9d573f413 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-l4fmO2LQpiSpGQVfuqJLcuYIryIlq/iYlPuI4FS+RlQ="; + cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 790884579e..f7e427aa11 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/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-06-20"; + version = "2024-06-28"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "a87e9c715b2d3249681f9cc8f8d9718030674d50"; - sha256 = "sha256-5eE3tBYBw8nkmmSR32SM8z0I01MSQAtIP2pEkE3bgRs="; + rev = "dd4be1b6fb9973d63eba334d8bd92b3da30b3e72"; + sha256 = "sha256-d6gqfBxAm4Y1xt204GhPhhEBOwP97K7qCeIf6I6Wbfg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 2a58427710..8639aa6805 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.15.3"; + version = "4.16.0"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Z9NUC1TR0lYBQux+Tkac0oFVnYIxsMkdWNGKQIz9IU="; + sha256 = "sha256-WjeUF8yD3il9DAava/SYv7ID6iM9AbR1ppazJnypgnk="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix index f91709a4c2..fd83401ba5 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-ZmOmdIvSs60GYT4zfhYONmfayDOEHG8acsf4u1A2wWQ="; + sha256 = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; }; strictDeps = true; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/default.nix b/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/default.nix index 1031e51e4f..c0a9d406a5 100644 --- a/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/default.nix +++ b/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/default.nix @@ -12,6 +12,11 @@ lib.recurseIntoAttrs rec { localFromCabalSdist = haskellPackages.buildFromCabalSdist localRaw; + # NOTE: ./local refers to the "./." path in `./local/generated.nix`. + # This test makes sure that localHasNoDirectReference can actually fail if + # it doesn't do anything. If this test fails, either the test setup was broken, + # or Haskell packaging has changed the way `src` is treated in such a way that + # either the test or the design of `buildFromCabalSdist` needs to be reconsidered. assumptionLocalHasDirectReference = runCommand "localHasDirectReference" { drvPath = builtins.unsafeDiscardOutputDependency localRaw.drvPath; } '' diff --git a/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/local/generated.nix b/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/local/generated.nix index bfa299962b..fae1e45f3d 100644 --- a/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/third_party/nixpkgs/pkgs/test/haskell/cabalSdist/local/generated.nix @@ -3,7 +3,7 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = ./.; + src = ./.; # also referred to as ./local in the test; these are the same path constants isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index e06759fa28..00f1ce90ef 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -99,6 +99,9 @@ let in { + # Disable on Darwin due to assumptions with __bootPackages + __attrsFailEvaluation = stdenv.isDarwin; + # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index bbc619bf82..663717ad83 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.227"; + version = "1.228"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-95En8WDGad6s6PkUbDOs/I+DJ7A7tRyIq+Ets1kDPKM="; + sha256 = "sha256-fBDaP7OpQKQV8CIM3s74+E1M6BwsS47Jn2AX8xQK0tI="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index df93e10fe1..f30c565180 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stoeckmann/xwallpaper"; description = "Utility for setting wallpapers in X"; license = licenses.isc; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "xwallpaper"; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix index 7e9bbcc975..2db13aa127 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.208"; + version = "3.0.209"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-kNZAjWoq3N+Lvu9JuU6UO4eZz2TcphbmqS1rZ75HgmU="; + sha256 = "sha256-d3HLFyJp++tZLJHjjM2xOcYyUanI9/AlrLt0cTcWO8s="; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix index dc2dd143c5..8d2b7d54c4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix @@ -1,20 +1,22 @@ { buildGoModule , fetchFromGitHub +, getent , lib , makeWrapper +, stdenv , xdg-utils }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.15.1"; + version = "1.16.1"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-MwmSGI3yRIlafRLx9hZzMLBg09mXGBeMaZJLpk+Fy5Y="; + hash = "sha256-jFeF/nxJMUO0tH8kgLgV6DIvN9KbcTy19LEvu4Paq8M="; }; - vendorHash = "sha256-3jW/8WvZHm66Hf9KLhj/LycCnJupF/zEU/2OcQKt1yg="; + vendorHash = "sha256-0ji2i2MSEqd3xxos96FHn9srDOtpvX3mFlaNoiTEa/U="; nativeBuildInputs = [ makeWrapper ]; @@ -28,10 +30,11 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; + nativeCheckInputs = [ getent ]; + checkFlags = [ - # requires network access "-skip=TestAWSConsoleUrl|TestAWSFederatedUrl" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "--skip=TestDetectShellBash" ]; meta = with lib; { homepage = "https://github.com/synfinatic/aws-sso-cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 8708325cc4..676fabd30d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -57,21 +57,21 @@ let }; in -with py.pkgs; buildPythonApplication rec { +py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.16.4"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.17.0"; # 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-l+AbacIs/1cJ78BACb3f5KuN9jM55WBT1SHD/lcAbcA="; + hash = "sha256-7XBdS33aoU3utAkKR0WSD2PXpx+2awd4hnFZhzRVdh8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'awscrt>=0.19.18,<=0.19.19' 'awscrt>=0.19.18' \ + --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 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ @@ -86,12 +86,15 @@ with py.pkgs; buildPythonApplication rec { sed -i '/pip>=/d' requirements/bootstrap.txt ''; - build-system = [ + nativeBuildInputs = [ installShellFiles + ]; + + build-system = with py.pkgs; [ flit-core ]; - dependencies = [ + dependencies = with py.pkgs; [ awscrt bcdoc botocore @@ -99,9 +102,7 @@ with py.pkgs; buildPythonApplication rec { cryptography distro docutils - groff jmespath - less prompt-toolkit python-dateutil pyyaml @@ -109,7 +110,12 @@ with py.pkgs; buildPythonApplication rec { urllib3 ]; - nativeCheckInputs = [ + propagatedBuildInputs = [ + groff + less + ]; + + nativeCheckInputs = with py.pkgs; [ jsonschema mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/README.md b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/README.md new file mode 100644 index 0000000000..30936ded0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/README.md @@ -0,0 +1,101 @@ +# Azure CLI + +## Extensions + +There are two sets of extensions: the one in `extensions-generated.nix` is generated with the script +`query-extension-index.sh`. These are extensions that don't have external requirements and thus can +be easily maintained and updated. The set should only be manipulated through an update based on the +script output. + +The other set of extensions is in `extensions-manual.nix`. These are extensions with requirements, +which need to be packaged and maintained manually. + +### Adding an extension to `extensions-manual.nix` + +To manually add a missing extension, first query its metadata from the extension index. +Use the following command, use the current version of azure-cli in nixpkgs as `cli-version` +and the name of the extension you want to package as `extension`: + +```sh +./query-extension-index.sh --cli-version=2.61.0 --extension=azure-devops --download +``` + +The output should look something like this: + +```json +{ + "pname": "azure-devops", + "description": "Tools for managing Azure DevOps.", + "version": "1.0.1", + "url": "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240514.1/azure_devops-1.0.1-py2.py3-none-any.whl", + "sha256": "f300d0288f017148514ebe6f5912aef10c7a6f29bdc0c916b922edf1d75bc7db", + "license": "MIT", + "requires": [ + "distro (==1.3.0)", + "distro==1.3.0" + ] +} +``` + +Based on this, you can add an attribute to `extensions-manual.nix`: + +```nix + azure-devops = mkAzExtension rec { + pname = "azure-devops"; + version = "1.0.0"; + url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; + sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + description = "Tools for managing Azure DevOps"; + propagatedBuildInputs = with python3Packages; [ + distro + ]; + meta.maintainers = with lib.maintainers; [ katexochen ]; + }; +``` + +* The attribute name should be the same as `pname`. +* Replace the version in `url` with `${version}`. +* The json output `requires` must be transformed into `propagetedBuildInputs`. +* If `license` is `"MIT"`, it can be left out in the nix expression, as the builder defaults to that license. +* Add yourself as maintainer in `meta.maintainers`. + +### Testing extensions + +You can build azure-cli with an extension on the command line by running the following command at the root of this repository: + +```sh +nix build --impure --expr 'with (import ./. {}); azure-cli.withExtensions [ azure-cli.extensions.azure-devops ]' +``` + +Check if the desired functionality was added. + +You can check if the extensions was recognized by running: + +```sh +./result/bin/az extension list +``` + +The output should show the extension like this: + +```sh +[ + { + "experimental": false, + "extensionType": "whl", + "name": "azure-devops", + "path": "/nix/store/azbgnpg5nh5rb8wfvp0r9bmcx83mqrj5-azure-cli-extensions/azure-devops", + "preview": false, + "version": "1.0.0" + } +] +``` + +### Removing an extension + +If extensions are removed upstream, an alias is added to the end of `extensions-manual.nix` +(see `# Removed extensions`). This alias should throw an error and be of similar structure as +this example: + +```nix +blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 +``` diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index d401801a15..89bd83d23a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -375,7 +375,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { sourceProvenance = [ sourceTypes.fromSource ]; license = licenses.mit; mainProgram = "az"; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ katexochen ]; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/extensions-manual.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/extensions-manual.nix index 6e098fb1f3..66c2268bff 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -1,3 +1,7 @@ +# Manually packaged extensions for azure-cli +# +# Checkout ./README.md for more information. + { lib , mkAzExtension , mycli @@ -12,6 +16,7 @@ sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; + meta.maintainers = with lib.maintainers; [ katexochen ]; }; rdbms-connect = mkAzExtension rec { diff --git a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix index 77677b071c..ec51b07d9e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.5"; + version = "18.2.10"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-jlkDjZN8Uljgqy/ooaJ3a0lomEbzaPI4FuMQhKDqLMA="; + hash = "sha256-HZAQpK7cai4FEBvQSIHGBdDMe4pQRXXF9DSax07rjF0="; }; - npmDepsHash = "sha256-gCBrhbhbFGbsBWX8AMLxzXw8CC5hYFJwserylSCuNFU="; + npmDepsHash = "sha256-9XVjyqLgi+gkEEp09P4HzmeRNINeXUC4mBmib6M6YyE="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix index ec42a0679b..73acc0944d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix @@ -1,13 +1,14 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, boulder +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + boulder, }: buildGoModule rec { pname = "boulder"; - version = "2022-09-29"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -15,19 +16,18 @@ buildGoModule rec { rev = "release-${version}"; leaveDotGit = true; postFetch = '' - cd $out + pushd $out git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT - find "$out" -name .git -print0 | xargs -0 rm -rf + find $out -name .git -print0 | xargs -0 rm -rf + popd ''; - hash = "sha256-MyJHTkt4qEHwD1UOkOfDNhNddcyFHPJvDzoT7kJ2qi4="; + hash = "sha256-AOCYCTIgT9QAn6LR72OG2C8Li1UMFieDrtkplXv4plA="; }; vendorHash = null; subPackages = [ "cmd/boulder" ]; - patches = [ ./no-build-id-test.patch ]; - ldflags = [ "-s" "-w" @@ -35,44 +35,267 @@ buildGoModule rec { ]; preBuild = '' - ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${src.rev} +$(cat COMMIT)\"" + ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${version} +$(cat COMMIT)\"" ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\"" ''; preCheck = '' # Test all targets. unset subPackages - - # Disable tests that require additional services. - rm -rf \ - cmd/admin-revoker/main_test.go \ - cmd/bad-key-revoker/main_test.go \ - cmd/cert-checker/main_test.go \ - cmd/contact-auditor/main_test.go \ - cmd/expiration-mailer/main_test.go \ - cmd/expiration-mailer/send_test.go \ - cmd/id-exporter/main_test.go \ - cmd/rocsp-tool/client_test.go \ - db/map_test.go \ - db/multi_test.go \ - db/rollback_test.go \ - log/log_test.go \ - ocsp/updater/updater_test.go \ - ra/ra_test.go \ - rocsp/rocsp_test.go \ - sa/database_test.go \ - sa/model_test.go \ - sa/precertificates_test.go \ - sa/rate_limits_test.go \ - sa/sa_test.go \ - test/load-generator/acme/directory_test.go \ - va/caa_test.go \ - va/dns_test.go \ - va/http_test.go \ - va/tlsalpn_test.go \ - va/va_test.go ''; + # Tests that fail or require additional services. + disabledTests = [ + "TestARI" + "TestAccount" + "TestAddBlockedKeyUnknownSource" + "TestAddCertificate" + "TestAddCertificateDuplicate" + "TestAddCertificateRenewalBit" + "TestAddPreCertificateDuplicate" + "TestAddPrecertificate" + "TestAddPrecertificateIncomplete" + "TestAddPrecertificateKeyHash" + "TestAddPrecertificateNoOCSP" + "TestAddRegistration" + "TestAddSerial" + "TestAdministrativelyRevokeCertificate" + "TestAuthorization500" + "TestAuthorizationChallengeNamespace" + "TestAuthzFailedRateLimitingNewOrder" + "TestAutoIncrementSchema" + "TestBadNonce" + "TestBlockedKey" + "TestBlockedKeyRevokedBy" + "TestBuildID" + "TestCTPolicyMeasurements" + "TestCertIsRenewed" + "TestCertificateAbsent" + "TestCertificateKeyNotEqualAccountKey" + "TestCertificatesTableContainsDuplicateSerials" + "TestCertsPerNameRateLimitTable" + "TestChallenge" + "TestCheckCert" + "TestCheckCert" + "TestCheckCertReturnsDNSNames" + "TestCheckCertReturnsDNSNames" + "TestCheckExactCertificateLimit" + "TestCheckFQDNSetRateLimitOverride" + "TestCheckWildcardCert" + "TestCheckWildcardCert" + "TestClientTransportCredentials" + "TestContactAuditor" + "TestCountCertificatesByNamesParallel" + "TestCountCertificatesByNamesTimeRange" + "TestCountCertificatesRenewalBit" + "TestCountInvalidAuthorizations2" + "TestCountNewOrderWithReplaces" + "TestCountOrders" + "TestCountPendingAuthorizations2" + "TestCountRegistrationsByIP" + "TestCountRegistrationsByIPRange" + "TestDbSettings" + "TestDeactivateAccount" + "TestDeactivateAuthorization" + "TestDeactivateRegistration" + "TestDedupOnRegistration" + "TestDirectory" + "TestDontFindRevokedCert" + "TestEarlyOrderRateLimiting" + "TestEmptyAccount" + "TestEnforceJWSAuthType" + "TestExactPublicSuffixCertLimit" + "TestExtractJWK" + "TestFQDNSetTimestampsForWindow" + "TestFQDNSets" + "TestFQDNSetsExists" + "TestFailExit" + "TestFasterGetOrderForNames" + "TestFinalizeAuthorization2" + "TestFinalizeOrder" + "TestFinalizeOrderWildcard" + "TestFinalizeOrderWithMixedSANAndCN" + "TestFinalizeSCTError" + "TestFindCertsAtCapacity" + "TestFindExpiringCertificates" + "TestFindIDs" + "TestFindIDsForHostnames" + "TestFindIDsWithExampleHostnames" + "TestFindUnrevoked" + "TestFindUnrevokedNoRows" + "TestGETAPIAuthz" + "TestGETAPIChallenge" + "TestGenerateOCSP" + "TestGenerateOCSPLongExpiredSerial" + "TestGenerateOCSPUnknownSerial" + "TestGetAndProcessCerts" + "TestGetAndProcessCerts" + "TestGetAuthorization" + "TestGetAuthorization2NoRows" + "TestGetAuthorizations2" + "TestGetCertificate" + "TestGetCertificateHEADHasCorrectBodyLength" + "TestGetCertificateNew" + "TestGetCertificateServerError" + "TestGetCertsEmptyResults" + "TestGetCertsEmptyResults" + "TestGetChallenge" + "TestGetChallengeUpRel" + "TestGetMaxExpiration" + "TestGetOrder" + "TestGetOrderExpired" + "TestGetOrderForNames" + "TestGetPendingAuthorization2" + "TestGetRevokedCerts" + "TestGetSerialMetadata" + "TestGetSerialsByAccount" + "TestGetSerialsByKey" + "TestGetStartingID" + "TestGetValidAuthorizations2" + "TestGetValidOrderAuthorizations2" + "TestHTTPDialTimeout" + "TestHTTPMethods" + "TestHandleFunc" + "TestHeaderBoulderRequester" + "TestIgnoredLint" + "TestIgnoredLint" + "TestIncidentARI" + "TestIncidentSerialModel" + "TestIncidentsForSerial" + "TestIndex" + "TestIndexGet404" + "TestInvoke" + "TestInvokeRevokerHasNoExtantCerts" + "TestIssueCertificateAuditLog" + "TestIssueCertificateCAACheckLog" + "TestIssueCertificateInnerErrs" + "TestIssueCertificateInnerWithProfile" + "TestIssueCertificateOuter" + "TestKeyRollover" + "TestKeyRolloverMismatchedJWSURLs" + "TestLeaseOldestCRLShard" + "TestLeaseSpecificCRLShard" + "TestLifetimeOfACert" + "TestLimiter_CheckWithLimitOverrides" + "TestLimiter_DefaultLimits" + "TestLimiter_InitializationViaCheckAndSpend" + "TestLimiter_RefundAndReset" + "TestLoadFromDB" + "TestLookupJWK" + "TestMatchJWSURLs" + "TestNewAccount" + "TestNewAccountNoID" + "TestNewAccountWhenAccountHasBeenDeactivated" + "TestNewAccountWhenGetRegByKeyFails" + "TestNewAccountWhenGetRegByKeyNotFound" + "TestNewECDSAAccount" + "TestNewLookup" + "TestNewLookupWithAllFailingSRV" + "TestNewLookupWithOneFailingSRV" + "TestNewOrder" + "TestNewOrderAuthzReuseSafety" + "TestNewOrderCheckFailedAuthorizationsFirst" + "TestNewOrderExpiry" + "TestNewOrderFailedAuthzRateLimitingExempt" + "TestNewOrderMaxNames" + "TestNewOrderRateLimiting" + "TestNewOrderRateLimitingExempt" + "TestNewOrderReplacesSerialCarriesThroughToSA" + "TestNewOrderReuse" + "TestNewOrderReuseInvalidAuthz" + "TestNewOrderWildcard" + "TestNewRegistration" + "TestNewRegistrationBadKey" + "TestNewRegistrationContactsPresent" + "TestNewRegistrationNoFieldOverwrite" + "TestNewRegistrationRateLimit" + "TestNewRegistrationSAFailure" + "TestNoContactCertIsNotRenewed" + "TestNoContactCertIsRenewed" + "TestNoSuchRegistrationErrors" + "TestNonceEndpoint" + "TestOldTLSInbound" + "TestOrderMatchesReplacement" + "TestOrderToOrderJSONV2Authorizations" + "TestOrderWithOrderModelv1" + "TestPOST404" + "TestPanicStackTrace" + "TestParseJWSRequest" + "TestPendingAuthorizationsUnlimited" + "TestPerformValidationAlreadyValid" + "TestPerformValidationBadChallengeType" + "TestPerformValidationExpired" + "TestPerformValidationSuccess" + "TestPerformValidationVAError" + "TestPrepAuthzForDisplay" + "TestPreresolvedDialerTimeout" + "TestProcessCerts" + "TestProcessCertsConnectError" + "TestProcessCertsParallel" + "TestRecheckCAADates" + "TestRecheckCAAEmpty" + "TestRecheckCAAFail" + "TestRecheckCAAInternalServerError" + "TestRecheckCAASuccess" + "TestRedisSource_BatchSetAndGet" + "TestRedisSource_Ping" + "TestRegistrationsPerIPOverrideUsage" + "TestRehydrateHostPort" + "TestRelativeDirectory" + "TestReplicationLagRetries" + "TestResolveContacts" + "TestRevokeCertByApplicant_Controller" + "TestRevokeCertByApplicant_Subscriber" + "TestRevokeCertByKey" + "TestRevokeCertificate" + "TestRevokeCerts" + "TestRollback" + "TestSPKIHashFromPrivateKey" + "TestSPKIHashesFromFile" + "TestSelectRegistration" + "TestSelectUncheckedRows" + "TestSendEarliestCertInfo" + "TestSerialsForIncident" + "TestSerialsFromFile" + "TestSerialsFromPrivateKey" + "TestSetAndGet" + "TestSetOrderProcessing" + "TestSingleton" + "TestStart" + "TestStatusForOrder" + "TestStoreResponse" + "TestStrictness" + "TestTLSALPN01DialTimeout" + "TestTLSConfigLoad" + "TestTimeouts" + "TestUpdateCRLShard" + "TestUpdateChallengeFinalizedAuthz" + "TestUpdateChallengeRAError" + "TestUpdateChallengesDeleteUnused" + "TestUpdateMissingAuthorization" + "TestUpdateNowWithAllFailingSRV" + "TestUpdateNowWithOneFailingSRV" + "TestUpdateRegistrationSame" + "TestUpdateRevokedCertificate" + "TestValidJWSForKey" + "TestValidNonce" + "TestValidNonce_NoMatchingBackendFound" + "TestValidPOSTAsGETForAccount" + "TestValidPOSTForAccount" + "TestValidPOSTForAccountSwappedKey" + "TestValidPOSTRequest" + "TestValidPOSTURL" + "TestValidSelfAuthenticatedPOST" + "TestValidSelfAuthenticatedPOSTGoodKeyErrors" + "TestValidateContacts" + "TestWrappedMap" + "Test_sendError" + ]; + + checkFlags = [ + "-skip ${lib.strings.concatStringsSep "|" disabledTests}" + ]; + postInstall = '' for i in $($out/bin/boulder --list); do ln -s $out/bin/boulder $out/bin/$i @@ -81,7 +304,6 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = boulder; - command = "boulder --version"; inherit version; }; @@ -96,6 +318,7 @@ buildGoModule rec { Let's Encrypt. ''; license = licenses.mpl20; + mainProgram = "boulder"; maintainers = with maintainers; [ azahi ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/boulder/no-build-id-test.patch b/third_party/nixpkgs/pkgs/tools/admin/boulder/no-build-id-test.patch deleted file mode 100644 index 661ed2b4a5..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/boulder/no-build-id-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/core/util_test.go w/core/util_test.go -index 8979edff..cfae13a4 100644 ---- i/core/util_test.go -+++ w/core/util_test.go -@@ -56,10 +56,6 @@ func TestSerialUtils(t *testing.T) { - fmt.Println(badSerial) - } - --func TestBuildID(t *testing.T) { -- test.AssertEquals(t, "Unspecified", GetBuildID()) --} -- - const JWK1JSON = `{ - "kty": "RSA", - "n": "vuc785P8lBj3fUxyZchF_uZw6WtbxcorqgTyq-qapF5lrO1U82Tp93rpXlmctj6fyFHBVVB5aXnUHJ7LZeVPod7Wnfl8p5OyhlHQHC8BnzdzCqCMKmWZNX5DtETDId0qzU7dPzh0LP0idt5buU7L9QNaabChw3nnaL47iu_1Di5Wp264p2TwACeedv2hfRDjDlJmaQXuS8Rtv9GnRWyC9JBu7XmGvGDziumnJH7Hyzh3VNu-kSPQD3vuAFgMZS6uUzOztCkT0fpOalZI6hqxtWLvXUMj-crXrn-Maavz8qRhpAyp5kcYk3jiHGgQIi7QSK2JIdRJ8APyX9HlmTN5AQ", diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 941a7956df..b748b90cb7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.33.4"; + version = "1.34.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-sYsrjp23F/fyvNfLbJdZrptwNrZYespz8xMLYIwGfH0="; + hash = "sha256-iipDvjPCNtk6wHjukgtnWzz0qwAJOU9DpolesNM2ELo="; }; - vendorHash = "sha256-GOr1l+4xDPm8ArqZpY0PshPeDnqYT+C4hgHGQkezBt8="; + vendorHash = "sha256-VzvbWh3qk9YvUdzlFa0UZMlNpjtLn1WJY4oN6/QPuuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix index 2b25d65a7f..f63b5049e2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , system , snapshotPath , autoPatchelfHook @@ -137,7 +138,7 @@ let inherit pname version snapshot; src = lib.optionalString (src != "") - (builtins.fetchurl + (fetchurl { url = src; inherit sha256; diff --git a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix index 4ffb46c52a..b3b0fd6d14 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.27.5"; + version = "0.28.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s7tSSYRWSkNY6sh88XqocTSQ9aS5+O0tqYjyH03NIb0="; + sha256 = "sha256-YOEuAjVIOmQdudjPc1ooGWRjm2ADemS7xSntho1k5KA="; }; vendorHash = "sha256-/X7kHaBZyDV4IqvKqyR7pAQLgYqIvcvSSh0NdrA5d3I="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index 128ab8e226..9d3f08cbc8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.120.0"; + version = "3.121.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-x64.tar.gz"; - sha256 = "1ck6i0hqzisl474vv84iwdg8yh57sc6q3pjq81xh6plp8s95rka2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-linux-x64.tar.gz"; + sha256 = "14w74zr07drz0llmvaqf2y9ylay9v7r9zrqn2irh12akgj2is5zk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-amd64.tar.gz"; @@ -17,24 +17,24 @@ sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-amd64.tar.gz"; - sha256 = "14dh5jf6ld5prgcbz74yk9fwcf1k6fsfm70gw1xy97m4crn2l4q9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-linux-amd64.tar.gz"; + sha256 = "17yvh68ycy2knllcdwzavbxz3cq93iclw26fpvzzzrlyypi4hy90"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-amd64.tar.gz"; sha256 = "1nqxc28ncrq1zpclm2acvvqa8yl21nmk6lb5sqsvy5kbizpzslar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-amd64.tar.gz"; - sha256 = "0vcmyzb6qbg8sfrbq06sdi1cc309132qsf92lswxydvnrqxvy0x4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0npah90y0529wfkcx0fjnlrnfaihmsg1b28isq1iskkm5pzc995g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-amd64.tar.gz"; - sha256 = "162zhf7iy9yr47h4fik3rps2wy7fsl74mg4kcnjxv65wjwmqlab4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-linux-amd64.tar.gz"; + sha256 = "0ydk31n1x8b41pbv9lva0il7c7pdifczavvr1gfmyykcrs1i2nnj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-amd64.tar.gz"; - sha256 = "1sgfw4b9s6k5854fa35y0p77v1n5h199yaghing4qn05i0miapgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-linux-amd64.tar.gz"; + sha256 = "1w6pk54inxswhazy0y452n7pxmwcbyqp9rqb3hnxlsc77bb0l4a0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-amd64.tar.gz"; @@ -45,16 +45,16 @@ sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-amd64.tar.gz"; - sha256 = "0n1kp9ip9f70rhn619r5a4pzyalcfx46252cfk3ha50drjv27l58"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-linux-amd64.tar.gz"; + sha256 = "0zgjmil0a3fidjbi5swlykg39qfifwszanwvkw37kxndvgqappmc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; sha256 = "1g6rzqsgak4801b2zzhq3ss6gkvkc8y7swpbm92sdbns71hxvw6w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.0-linux-amd64.tar.gz"; - sha256 = "18876q1n1q4482pfb6r2v8s2ckplq6i0ldf0v7r2m2fws00sin8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.1-linux-amd64.tar.gz"; + sha256 = "04xb28yklg86yyf81p76qv03pbsnfjkvnl0gdw6hyl05f3yyq4h3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-amd64.tar.gz"; @@ -73,16 +73,16 @@ sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-amd64.tar.gz"; - sha256 = "0qxp61glmnqh5a4w07b7hwbj0nkg7c15pqil8855jv15zakgp495"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-linux-amd64.tar.gz"; + sha256 = "1nr7lbdql05imn435gbl87w2fng6kkqza73dr5cp8mvp8hyjrykv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-amd64.tar.gz"; - sha256 = "1ilpp4xkdpp3mq4i0sicxbndn15gbrhjsvxp8aanc20dgpcr5hy5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-linux-amd64.tar.gz"; + sha256 = "14il41a0bh498lxg9m69v76qprpa5099fnyi2d9xjdrddjvkkgkg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.1-linux-amd64.tar.gz"; - sha256 = "0858slr7z027dwx3nwgb175ijyypkv5brm27n96148xk42qw1say"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.1.0-linux-amd64.tar.gz"; + sha256 = "0sb0zwcfgycdpkbiy2rm43d3i32vgdlrh1h8xlva5n0vfcc6mlyv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -97,16 +97,16 @@ sha256 = "08vjj3wlxkrriqncmhx4r03dlg8w670qp9vhkzi4srax3141z518"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.21.0-linux-amd64.tar.gz"; - sha256 = "00qwjy10793p9687xagcfspw64vq6y0lgclb69rvfz5mwarq7i0j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-linux-amd64.tar.gz"; + sha256 = "1b1asxsrhzw060sr99hjx5nd6s7s7k8r18274104ngq5h66n30ln"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-amd64.tar.gz"; sha256 = "07y4bnkiw0yn3vbm6h4z44v4yq26mbnhsfh3fpp8jcfm3raqivsy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.4-linux-amd64.tar.gz"; - sha256 = "0yv68ccyzi7hv2xaa8sybg4mf5qc7wa25kjziy2fdfsjyl8fn6ps"; + 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-openstack-v4.0.0-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-amd64.tar.gz"; - sha256 = "1bzmgs0xy1l2rwh843y7rdamsixm8lddybr2y088ilf69g8a63gl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-linux-amd64.tar.gz"; + sha256 = "0li0n75c8b52lsm22knymn1y4zrw08aiglhcp16qpwnzh1r2j7y6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "0sy0fm73h5rv7jilj6dcyf2244hws8j4ayb3scr4ranckn05dpm1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.1.1-linux-amd64.tar.gz"; - sha256 = "05g9fhg25ixxxrv0pm066cjdimjzs9wp8jlxv9179hny9hcy8fyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-amd64.tar.gz"; + sha256 = "02a0vbqwaq65yfmjqjrix0s4asnr3mrpn7rr97wmrc7nr47x3pcd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-x64.tar.gz"; - sha256 = "090hvs9dghc4jzrsxj71gxl6gmsilfr3sydw7is9hwpjiykk1k3n"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-darwin-x64.tar.gz"; + sha256 = "1cpgnj8d291181f08mppinhywjir4i232x2k1n41f2gfaf7dikbx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-amd64.tar.gz"; @@ -175,24 +175,24 @@ sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-amd64.tar.gz"; - sha256 = "0pyc2d7jg5bi3lz151d94i0i8sfrxhqnv388sdz6yrdkhz434z82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-darwin-amd64.tar.gz"; + sha256 = "157mqj4bp3g99dlxsvw7v9ir7ngc8q1cp6s70nmsn2s3kvwn782n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-amd64.tar.gz"; sha256 = "1qi3vmzsp3bcq7y8y7q0h7hiqk6r5mzjq7h6i0g77fjcyjabqdch"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-amd64.tar.gz"; - sha256 = "1jhnh3f2zni8wmddf2bz25r37iwbh1dyf8j9wnjyync1fqjy877y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "17k2c07v1gh0wdqqa1c29hl0mbxc1lkk3rdfnvqkh53flklm45yd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-amd64.tar.gz"; - sha256 = "1km113wism9yf4rlx44g171jkxz3srpyvyi5hwablpw9pk93qnsv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-darwin-amd64.tar.gz"; + sha256 = "0w4dcx2y4y7alykf795z2pmw7i9shlzk3qizrfhpjwpk0q75rr35"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-amd64.tar.gz"; - sha256 = "01xjm5q6kixyz4yvgjdhfskm3l7caygd33h19w7kzaih3dfffd25"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-darwin-amd64.tar.gz"; + sha256 = "19lpmkhvc5d32iq2p31116hrcp3za3cm9wxkp3cqwssq9lhhw94r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-amd64.tar.gz"; @@ -203,16 +203,16 @@ sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-amd64.tar.gz"; - sha256 = "120z9hs349qzjk84fwzizhpp90fp21fgapxbgy56k22pshl35wzs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-darwin-amd64.tar.gz"; + sha256 = "1hzg4xdbgfh46733pgnjj9yl0zh3ymzq1rnhyb27rl5v543pw94c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; sha256 = "1gcv6ri58a4k8g7dzh0xvpmv1x6ndlihkmd5n2gza303i9c8466n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.0-darwin-amd64.tar.gz"; - sha256 = "1k16z181nd6h3fabxhg1qrcrjnwppbhlqwqks99p7z72zlgx02kp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.1-darwin-amd64.tar.gz"; + sha256 = "043w7mh41dvixhvj2aazdc5mdhydmx29jqdcjdnx81x7i9bj9v3y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-amd64.tar.gz"; @@ -231,16 +231,16 @@ sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-amd64.tar.gz"; - sha256 = "0d3pcwj7lncq4zalbkd3nyk4dbas5328maxa3dv55z6wi4x2ds9n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-darwin-amd64.tar.gz"; + sha256 = "16jpbkb4yms7vvffisgi1bqx7anyb18qzjprkl5rjbjp5bdl83ra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-amd64.tar.gz"; - sha256 = "08plbmrzdd4vbds4qihdq3c0w9fxjaa64lmlaplla4z0qvi5cjc2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-darwin-amd64.tar.gz"; + sha256 = "06gbb1rsvgjw09w2y0qm5zqlkp71wscw57xjf64v37h2dlxw5k1d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.1-darwin-amd64.tar.gz"; - sha256 = "1kkwbds9y8r765srg7q0jh2pw5dp0r8plb26k25bvlh6ymnh9plg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.1.0-darwin-amd64.tar.gz"; + sha256 = "0b61rqyz0pd58j614bak3zp2bzdf7jsqmwb9qdx3vymx3ls0qapa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -255,16 +255,16 @@ sha256 = "082gxffyjipccpi4cn6mlwvcg4c59773z7id58gsvdvxaddh0jpj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "0d67vw6imc70gq0356jgpg30ah9sgnqki0ijjw1iss6bsaxhbkxx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-darwin-amd64.tar.gz"; + sha256 = "0i2v2l7k686nbbhr1zsfk9wzmlh34x2i0lgi3c1dpgvzdkra399a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-amd64.tar.gz"; sha256 = "02ggykac6acylarljx0qg8i5b3k6apiz8njhcapfpw7my4whzzd7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.4-darwin-amd64.tar.gz"; - sha256 = "04cmmgi5rxj9lbs5s3d4gzrngiw52gyvsb7pi8w7v6cpb9p8q3gx"; + 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-openstack-v4.0.0-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-amd64.tar.gz"; - sha256 = "1h06j9jpba6wxv8nz33ysz5bx928qbm64nk4gv5qa5zzdpm4c1mh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-darwin-amd64.tar.gz"; + sha256 = "1aqalfgy0a2w8ka5q4ywr98caaz8x16yxpplbhf9p8rnnsmx61mp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "1yf2xhsxg08wk5flzj6m0ix8www5qh0xx1ak7kd7hhnidfvshhiy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.1.1-darwin-amd64.tar.gz"; - sha256 = "1mbrrw4mvf1dnh6zp66lb9lsirg24gikvd7ls51bdld4pfs1rn3z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-amd64.tar.gz"; + sha256 = "0lc7baayl1yq67mg9j0q0sgln915234f7rs22ncp9lk996xgwin8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-arm64.tar.gz"; - sha256 = "0aki919lihvzva9qswc1lqigssiqqy8zqdd6v982xfc5b29xa0cb"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-linux-arm64.tar.gz"; + sha256 = "1qpmpwhba4pg0mk13rxhdx6zgdnjf4dbfvgaragyajm41wiyz8pl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-arm64.tar.gz"; @@ -333,24 +333,24 @@ sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-arm64.tar.gz"; - sha256 = "0yn3rbya6fr12m3ah2f5qywp85vf198zsdkpzx5wny6s6prnsiw8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-linux-arm64.tar.gz"; + sha256 = "09phgiri9zjp8ihys8g31m8mmvck0pxg3d4h4p92ynagrb7mym79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-arm64.tar.gz"; sha256 = "0fxsa527dnvc77flfgqbmj5823mfwwfp67r9sswkhik3i6i0lm3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-arm64.tar.gz"; - sha256 = "1dv2y358fwcp6pr8mb1yhw5lygs9aqf8ma50vz3p74z1101lz3id"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-linux-arm64.tar.gz"; + sha256 = "1zbq7k4w9m8kq4j55ccb434lcvlbyx5idf2fjljnw2ic5xznrins"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-arm64.tar.gz"; - sha256 = "1881iqrnsfja341nq27k6pv3c85pw27cyq5ykk5bs2vzjvv008g0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-linux-arm64.tar.gz"; + sha256 = "12531i2swifhg2pl4c0daslldwvbadwls27ikwb777qr302mqnbl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-arm64.tar.gz"; - sha256 = "0hmd6y0mh9bwx38k5hqbgclwfsa8ls64511zkhlmln6pix3bn4k0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-linux-arm64.tar.gz"; + sha256 = "0wxk3r8w80f2kvnn5djvwsja7vahcvq73bwvv3g9nh98qbrvzdcf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-arm64.tar.gz"; @@ -361,16 +361,16 @@ sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-arm64.tar.gz"; - sha256 = "0vrlk561p3aax3cgzpvjgwsxwwc5vblqb28cvc1xrj4bphd7xjda"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-linux-arm64.tar.gz"; + sha256 = "15yh1k3yvf72hdbjffsxhm0bq65mb6ca4fzwbhp65mahxwgm4bak"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; sha256 = "0rmn667z8s4pndck24h82qp5fyshixvji736x6barlpiamy4lkhj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.0-linux-arm64.tar.gz"; - sha256 = "1nnn6z6j76ky78jh5h1ii07hci041p6qsm7shg8k7fsmb1g0bkji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.1-linux-arm64.tar.gz"; + sha256 = "1f3pyx69r4bj9y28w2crp4bhcb0yjnlxrgc3524m98m2h26ikdzi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-arm64.tar.gz"; @@ -389,16 +389,16 @@ sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-arm64.tar.gz"; - sha256 = "1qs9bcsw91s450sdxb2lrqzxl2q4wmpfjfspp7g5yxnv8ns8knl6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-linux-arm64.tar.gz"; + sha256 = "07cl25q1n94k956jykmz78bx0zpyn808l306zs55d2mvz3cj71qw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-arm64.tar.gz"; - sha256 = "0b2cc2ybw76h283ir4nl51cf5zbl2bxrcr5iilskqf58b8yfrra0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-linux-arm64.tar.gz"; + sha256 = "0iw693ql9wgqfp5n2rx5h4hj60x3wjwkgf6yvp9hhf5ijb5a9hzm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.1-linux-arm64.tar.gz"; - sha256 = "0k8iyn27qm5y02niizh7azpvz0mq7v50i308ylicm8290qgl1xq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.1.0-linux-arm64.tar.gz"; + sha256 = "1sk5ybg0szfr7d3wxr1mrnsdpqqf97vqfk1f7h0gmkmap4v6wrci"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -413,16 +413,16 @@ sha256 = "12y68fz2bvnpg35agdbrplmh208wn8db1fnx7y1ml4agfkrsvrqg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.21.0-linux-arm64.tar.gz"; - sha256 = "1vjj6chib76p89ydm100v0yjv286jwck3ywp6if7mcnjj52fyrym"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-linux-arm64.tar.gz"; + sha256 = "0c2syxqpp0p37xgphwycaf1br9pw4lgkl30zzgcdp8mbdd2jnbw2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-arm64.tar.gz"; sha256 = "12hfiwhxwj3ah0fbcagjmwm5fzp7qs8cxaygr3w7ajq4x7yfdadf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.4-linux-arm64.tar.gz"; - sha256 = "11sd0kfkbczybkfh3n9fr0j8lnjfqcwfvxmvwfgm8d2jz9c7rhsm"; + 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-openstack-v4.0.0-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-arm64.tar.gz"; - sha256 = "1jhjz9kcs09x5i128mx4k7mh5fjafmg21hnifxh2avcari52r1q6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-linux-arm64.tar.gz"; + sha256 = "0gara61i7n7z42q69cwv98hp8ac7wvpgw1g349bbl2kjrd9ymxvc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "0fxxiyl1g120lzc2rm13cz7lxjp1psvzjd811i7ljy43ii05ahq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.1.1-linux-arm64.tar.gz"; - sha256 = "08w72fz5lzsaa4q5zfnkkggpyy5brqx1zpbybkvc9r91s44kbjjf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-arm64.tar.gz"; + sha256 = "0w9nqw99k0vril5rm2bsgny8vrmw84d8qlb2lvxp6qbn0hvaim6v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-arm64.tar.gz"; - sha256 = "17niys4r8i1b40g3sv783ndnbks0lqpdasi2p3sx7zc64sq6v7nm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-darwin-arm64.tar.gz"; + sha256 = "0c0zhkc2p2bpnx3pzf63nl77w3qcdclrn7jns6yrp8nghaaq383x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-arm64.tar.gz"; @@ -491,24 +491,24 @@ sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-arm64.tar.gz"; - sha256 = "0blhb4ymfwrc7lm7v4sg0kmpibwbrrxcwd30imqp0gk6awmnjggn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-darwin-arm64.tar.gz"; + sha256 = "1p41qcjid0bndmvqbdj9xp3jcvcwww3np7wsldvnbi8fbp0daavf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-arm64.tar.gz"; sha256 = "1g461qcw8479fgchyg0wl086lay2irz7f1415bdvjhcjhjsyqas9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-arm64.tar.gz"; - sha256 = "0a1aibs654xbcdm8kdcjjrg55fb0yh819d52zz3h6hpg40bahqcx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-darwin-arm64.tar.gz"; + sha256 = "09ji7blpyf1zjffilbn1nmn4606ngzn8is0c78wzm14mc4cg4ypj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-arm64.tar.gz"; - sha256 = "0kgyg5jqxrlv8jr5iyqdj6xg1x4n2zjnlaymwyvakygryfnq4b1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-darwin-arm64.tar.gz"; + sha256 = "1cfkygay4yacjjb49z1j0q1hh9kppq53q471nw5gm1rz71qlzqan"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-arm64.tar.gz"; - sha256 = "1abz7hc4shvijf8291528blba3n4ixwwpk5jqv7i38bsn1jh1q3f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-darwin-arm64.tar.gz"; + sha256 = "15bvl134a3dg6mx09gqrvcv3c21ib8ln824vwc6dpj8hg6f9nk8m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-arm64.tar.gz"; @@ -519,16 +519,16 @@ sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-arm64.tar.gz"; - sha256 = "0k2aab9vn0l9sq0pgzwl3cz1gzg5yc4gqw1yln2nq637wknp7p6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-darwin-arm64.tar.gz"; + sha256 = "06036cwp66s2hpa0y999mz6vxs51mb9rryp29hqxsra2bv7wb3kj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; sha256 = "1wfiq9rzdzp8pa88g7dbgz644dih8f9f0apw6vfngjjsd2kj3k1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.0-darwin-arm64.tar.gz"; - sha256 = "0r32xy57ggpg5mlcrcvb0vrksfix3bsf2jdib1z2h3dydgczl2n6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.28.1-darwin-arm64.tar.gz"; + sha256 = "16mn1lis1wkasgpvy6y8619fsn03fy0drii87l9yv4br2wzikg13"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-arm64.tar.gz"; @@ -547,16 +547,16 @@ sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-arm64.tar.gz"; - sha256 = "1d87xac6mwzigqrql4vq40gmz9xn9f4pi1rri54393jkfqnzi64i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-darwin-arm64.tar.gz"; + sha256 = "1cqm3r6qv5wgz3pmjq7c9184pgjr26sjkjzkk2x3fvi431z4n0q9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-arm64.tar.gz"; - sha256 = "0wafcf9vw32yrpj9qmffhbxn08602br6n06mjyvcjm25mg8iwb4p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-darwin-arm64.tar.gz"; + sha256 = "1fdlvd2jsrwicqbz78rv165afgzs3hnh0c9hlv039h0fxpipyv9j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.1-darwin-arm64.tar.gz"; - sha256 = "1w466j7djvav41n27klq6i0fj1zlzkfqcl5cs8qh0d7mszh03h15"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.1.0-darwin-arm64.tar.gz"; + sha256 = "0awfdid01isfsr7gwjvvqljw8ia4pbym615gwx3fq94qbyaq16bv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -571,16 +571,16 @@ sha256 = "0jkv32p117nyr4cx03iflqz8mhllkfnwf03xdz771ii2nw6xvj5z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "1axhhyvnajly6bgxdbw5grm7zk06rwvhxpbnsnpb06pwp05219z4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-darwin-arm64.tar.gz"; + sha256 = "06x4b6lyrma88vlw6s6dq235dx8213yiqc2xav441w42ynzizip1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-arm64.tar.gz"; sha256 = "1l6q20hinxki5124s14lz67zwlwjdmzh33yni3hwm79cwzvvqqi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.4-darwin-arm64.tar.gz"; - sha256 = "0lpwg6rwf5fa2ydf3j243k07jp6briayy953n4m2hyqhsgs6q62q"; + 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-openstack-v4.0.0-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-arm64.tar.gz"; - sha256 = "0z3bvfcfdx1fps2zgx7g1jmrlhrp0m6sbd91c7ddx7ig4g2l4xfz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-darwin-arm64.tar.gz"; + sha256 = "13z3pvd2i0sr0h723z7b0i0nni7dpd7zvgcd1gs01xbql8av7h8r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "00iql0iprfmp4glshlx7w9lz8ifmzcp7cbh8qsnacvhbix0azsrg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.1.1-darwin-arm64.tar.gz"; - sha256 = "1vfl1qk2iiv1d51l9jzcy3p96n8fwk7fbdsvvyfd3cn2xp07npnv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-arm64.tar.gz"; + sha256 = "0ssnhzgddg30rgyrqrcp0xmxmik16blk2a06mgcy0q5llara69f2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 82a035bc44..01b2cc14a9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.94.14"; + version = "0.94.16"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-A2U/NoVbUW0U5/1Q/jJ5MFBrcHB1c23EMAY3bwWZ/R4="; + hash = "sha256-oWKE7k/ryEDdz63xeauDGK9y0nz6pri/sOnFTk0qBdM="; }; vendorHash = "sha256-qrDadHGhjwsAIfIQIkUeT7Tehv1sTtsfzgPyKxc5zJE="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix index b55ff360c7..4bd6869d2d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix @@ -1,6 +1,6 @@ { lib , stdenvNoCC -, requireFile +, fetchurl , undmg , pname , version @@ -9,17 +9,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version meta; - src = requireFile rec { + src = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh"; - message= '' - vnc-viewer can be downloaded from ${url}, - but the download link require captcha, thus if you wish to use this application, - you need to download it manually and use follow command to add downloaded files into nix-store - - $ nix-prefetch-url --type sha256 file:///path/to/${name} - ''; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 38f3986b6a..9776ececcf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -17,7 +17,6 @@ let }; maintainers = with maintainers; [ emilytrau onedragon ]; platforms = [ "x86_64-linux" ] ++ platforms.darwin; - hydraPlatforms = []; mainProgram = "vncviewer"; }; in diff --git a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix index 164fe67b68..552b1dc035 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix @@ -1,6 +1,6 @@ { lib , stdenv -, requireFile +, fetchurl , autoPatchelfHook , rpmextract , libX11 @@ -13,18 +13,11 @@ stdenv.mkDerivation (finalAttrs: { inherit pname version; - src = { - "x86_64-linux" = requireFile rec { + src = rec { + "x86_64-linux" = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; sha256 = "sha256-Ull9iNi8NxB12YwEThWE0P9k1xOV2LZnebuRrVH/zwI="; - message= '' - vnc-viewer can be downloaded from ${url}, - but the download link require captcha, thus if you wish to use this application, - you need to download it manually and use follow command to add downloaded files into nix-store - - $ nix-prefetch-url --type sha256 file:///path/to/${name} - ''; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index ba65217d59..3b9ffe581a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.31.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-v8KkF5GShMDVjeAoe/bvoqHIBKDJ1hd6RIpu9Zugc6w="; + sha256 = "sha256-+zSUgwh3CKyvBzRY4NevkoSINfvMNOfw8rvs48O0yJw="; }; - vendorHash = "sha256-Oprca0JX8SmrEGrnalzKt89qrXa5UEbErl8BOFJlHGI="; + vendorHash = "sha256-iEPBTM+hVAGs0TF30onHR0lWAALQbsA164OTkYuOdwc="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index e03024c4a5..acbc464663 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-gunLbZOT0cnWGxc6714XcPdHJVK4LbDBwC2zt03WrUM="; + hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ="; }; - vendorHash = "sha256-xFWU+OazwLTb5qdFeYth1MlPJ76nEK4qSCNGVhC/PxE="; + vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index f24acd6018..c5979437f4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.06.03"; + version = "2024.06.18"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-iq/NnXMATYRCjeBlcSvgdCVe2lDz/Tade7GQnlCygGM="; + hash = "sha256-QxIbA/rQ4Sk4XFZ1XR3CAOt3L3xwxFFrDQK8B22egwY="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix index bb09b9b183..d4ee520ad6 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-1DG8pemlF5bURbdJwGTZqp3WVfLOwGEpfqq9q1NtwaE="; + hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix index 84261b04a9..68235ab3d4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix @@ -4,9 +4,7 @@ , ffmpeg }: -let - python = python3; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "spotdl"; version = "4.2.5"; pyproject = true; @@ -18,40 +16,43 @@ in python.pkgs.buildPythonApplication rec { hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI="; }; - build-system = with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ poetry-core ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; - dependencies = with python.pkgs; [ - spotipy - ytmusicapi - pytube - yt-dlp - mutagen - rich - beautifulsoup4 - requests - rapidfuzz - python-slugify - uvicorn - pydantic - fastapi - platformdirs - pykakasi - syncedlyrics - soundcloud-v2 + # Remove when https://github.com/spotDL/spotify-downloader/issues/2119 is fixed + patches = [ ./is_lrc_valid-failure.patch ]; + + dependencies = with python3.pkgs; [ bandcamp-api + beautifulsoup4 + fastapi + mutagen + platformdirs + pydantic + pykakasi + python-slugify + pytube + rapidfuzz + requests + rich + setuptools + soundcloud-v2 + spotipy + syncedlyrics + uvicorn + yt-dlp + ytmusicapi ] ++ python-slugify.optional-dependencies.unidecode; - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - pytest-mock - pytest-vcr + nativeCheckInputs = with python3.pkgs; [ pyfakefs + pytest-mock pytest-subprocess + pytest-vcr + pytestCheckHook ]; preCheck = '' @@ -59,7 +60,7 @@ in python.pkgs.buildPythonApplication rec { ''; disabledTestPaths = [ - # require networking + # Tests require networking "tests/test_init.py" "tests/test_matching.py" "tests/providers/lyrics" @@ -71,7 +72,7 @@ in python.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # require networking + # Test require networking "test_convert" "test_download_ffmpeg" "test_download_song" @@ -88,10 +89,10 @@ in python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Download your Spotify playlists and songs along with album art and metadata"; - mainProgram = "spotdl"; homepage = "https://github.com/spotDL/spotify-downloader"; changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "spotdl"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch b/third_party/nixpkgs/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch new file mode 100644 index 0000000000..e419bca125 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch @@ -0,0 +1,65 @@ +From 0c1357470450d98b3b7fe5444ac460ba9ee04425 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler +Date: Mon, 17 Jun 2024 02:19:33 -0700 +Subject: [PATCH 1/2] Update lrc.py for updated function in python-syncedlyrics + +See syncedlyrics commit: [here](https://github.com/moehmeni/syncedlyrics/commit/64d3f9de3d17bec69cbc3b3b5acd1ab847fde4b2) +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index 726fefbee..e59490b53 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import is_lrc_valid, save_lrc_file ++from syncedlyrics.utils import has_translation, save_lrc_file + + from spotdl.types.song import Song + +@@ -25,7 +25,7 @@ def generate_lrc(song: Song, output_file: Path): + - output_file: Path to the output file + """ + +- if song.lyrics and is_lrc_valid(song.lyrics): ++ if song.lyrics and has_translation(song.lyrics): + lrc_data = song.lyrics + else: + try: + +From bfa9456049132e64b5c83655bdeae7c9dcd1b532 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler +Date: Wed, 26 Jun 2024 18:06:59 -0700 +Subject: [PATCH 2/2] Update lrc.py + +Seems to have fixed the update of syncedlyrics to 1.0.0 +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index e59490b53..cf7478214 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import has_translation, save_lrc_file ++from syncedlyrics.utils import has_translation, Lyrics + + from spotdl.types.song import Song + +@@ -34,7 +34,7 @@ def generate_lrc(song: Song, output_file: Path): + lrc_data = None + + if lrc_data: +- save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) ++ Lyrics.save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) + logger.debug("Saved lrc file for %s", song.display_name) + else: + logger.debug("No lrc file found for %s", song.display_name) diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix index 8a614ef408..7905bab5b1 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix @@ -35,10 +35,10 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/v${version}/master/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; - homepage = "https://github.com/rhasspy/wyoming-openwakeword"; + homepage = "https://github.com/rhasspy/wyoming-piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index 9e36f7572d..56a5a93139 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -22,12 +22,12 @@ }: stdenv.mkDerivation rec { - version = "2.7.14"; + version = "2.7.15"; pname = "dar"; src = fetchzip { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-qesq+Rqo/llvQ7JPqYwLhObwZw2GlhXpYyc6NEA9c4M="; + sha256 = "sha256-2CuPqb17E2bHBuwRPA0QoIeTUq/lJZ3pFKbtqsRPktk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix index d76028fd65..fcd29ee68e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.52"; + version = "2.52.1"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-S2KmKPqjZ64RQMJ+vt827AIzaWlnEUoP3Npr2/FIZM8="; + sha256 = "sha256-/HRn/QLpo70FUxx+5h9Os3TTqtVlJ7C4fyraGPvoato="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix index 671f822816..62022066a6 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "isomd5sum"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "rhinstaller"; repo = pname; rev = version; - sha256 = "sha256-tpDk7Wt2zV0vB2IILuIJyMMFBSiHKAVkSqsCwnWApJ0="; + sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix b/third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix index 8d44660898..8bab34043c 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/hacpack/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/The-4n/hacPack"; description = "Make and repack Nintendo Switch NCAs/NSPs"; license = licenses.gpl2Only; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "hacpack"; }; diff --git a/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix b/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix index cab59ebde5..8848d45064 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Tool to manipulate common file formats for the Nintendo Switch"; longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; license = licenses.isc; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; mainProgram = "hactool"; }; diff --git a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix index 1d965dd2ca..89515e31b4 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MCredstoner2004/ImageLOL"; description = "Simple program to store a file into a PNG image"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "ImageLOL"; }; diff --git a/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix b/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix index a068788dc1..a2597b985c 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Convert Nintendo Switch executable files to ELFs"; license = licenses.unfree; # No license specified upstream platforms = [ "x86_64-linux" ]; # Should work on Darwin as well, but this is untested. aarch64-linux fails. - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "nx2elf"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index df328c942a..955a2b97e7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.9"; + version = "6.9.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-fhSl1ZfzI919G0U+Ok5mGn6fB+oGDvv/T3b/gxWRfeg="; + hash = "sha256-Q4ZbsnLcCrJYXeNgVDTYG6IXV48Il79wDNNsFKxAZSo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix index 997aeec80f..e8f1743106 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "exFAT filesystem userspace utilities"; homepage = "https://github.com/exfatprogs/exfatprogs"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ zane ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/juicefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/juicefs/default.nix index 518a5ca55f..2bca01f545 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/juicefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/juicefs/default.nix @@ -1,33 +1,31 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub -, stdenv }: -# JuiceFS 1.1.2 doesn't build with Go 1.22. Fixed in upstream. This can be -# reverted in future releases. https://github.com/juicedata/juicefs/issues/4339 -buildGo121Module rec { +buildGoModule rec { pname = "juicefs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sf68N5ZKveKM6xZEqF7Ah0KGgOx1cGZpJ2lYkUlgpI0="; + hash = "sha256-qPdrcWCD8BYwRwnynNhcti7eUskgHP1kAS6KiS0LHsc="; }; - vendorHash = "sha256-ofUo/3EQPhXPNeD/3to5oFir/3eAaf9WBHR4DOzcxBQ="; + vendorHash = "sha256-tKbn/dFnYTc0fYwYUrrpdN1hzx047yQSFdTG94CifhM="; - ldflags = [ "-s" "-w" ]; + excludedPackages = [ "sdk/java/libjfs" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/juicedata/juicefs/pkg/version.version=${version}" + ]; doCheck = false; # requires network access - # we dont need the libjfs binary - postFixup = '' - rm $out/bin/libjfs - ''; - postInstall = '' ln -s $out/bin/juicefs $out/bin/mount.juicefs ''; @@ -37,6 +35,5 @@ buildGo121Module rec { homepage = "https://www.juicefs.com/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix index 925a600b64..0181c0d0ef 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -3,18 +3,18 @@ , fetchFromGitHub , autoreconfHook , fuse2 -, unrar_6 +, unrar }: stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.6"; + version = "1.29.7"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b8zMCzSFJewXMQOuaKwMJx//Wq9vT/bUj6XS/jDBBBo="; + sha256 = "sha256-iYlmNtaJZrnsNNNlaoV1Vu6PHrHIr/glhgs3784JCm4="; }; postPatch = '' @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ fuse2 unrar_6 ]; + buildInputs = [ fuse2 unrar ]; configureFlags = [ - "--with-unrar=${unrar_6.src}/unrar" + "--with-unrar=${unrar.src}/unrar" "--disable-static-unrar" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index b44ee42305..bb5877f0ac 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { - sha256 = "sha256-/WdY++rrcQ3N+4ROeaA113Iq1nMGxOp3LzsCaLsxaaM="; + sha256 = "sha256-BttU5wdnifhsFPdNX3yb/l12biskzED72v0Qfxi7FWU="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 71a25ef88b..2d89160fa7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem to mount squashfs archives"; homepage = "https://github.com/vasi/squashfuse"; - maintainers = [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = "BSD-2-Clause"; }; diff --git a/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix b/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix index 0388127774..983efcded3 100644 --- a/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "er-patcher"; - version = "1.12-1"; + version = "1.12-2"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-IN7JKaPexc6XLOymBWKbwtjhIlSEy3NhXoPpLiIc7qY="; + sha256 = "sha256-C+QtPpvEuYAYxYGs2lbYLaYkDge6r0RNCISglkQpjEQ="; }; buildInputs = [ @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { that ensures the patched executable is never run with EAC enabled (unless explicity told to do so). Use at your own risk! ''; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "er-patcher"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix b/third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix index 3dae625071..7661e04430 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mainProgram = "amidst"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix b/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix index c717d25c55..5667a55fd6 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mainProgram = "fabric-installer"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/generic.nix b/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/generic.nix index 3a103c0572..a375ac9def 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/generic.nix @@ -37,7 +37,7 @@ runCommand "optifine-${mcVersion}" { ''; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "optifine"; }; diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix b/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix index 4561a5c864..459541ddb1 100644 --- a/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix @@ -84,7 +84,7 @@ buildDotnetModule rec { binaryNativeCode ]; license = licenses.mit; - maintainers = [maintainers.ivar]; + maintainers = [ ]; mainProgram = "OpenTracker"; platforms = ["x86_64-linux"]; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix index 5085462fb4..8684c730b1 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "adriconf"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GRmra4P30EW9/WrG84HXYC3Rk4RD+BhuWtsSXvY/5Rk="; + sha256 = "sha256-0XTsYeS4tNAnGhuJ81fmjHhFS6fVq1lirui5b+ojxTQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index 27b5c7ca59..7ffdd959b2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/google/agi/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = with maintainers; [ ivar kashw2 ]; + maintainers = with maintainers; [ kashw2 ]; sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode diff --git a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix index a4ece4ae1a..1d93bbe715 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://developer.qualcomm.com/software/snapdragon-profiler"; description = "An profiler for Android devices running Snapdragon chips"; license = licenses.unfree; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 239d8c5d65..2305e7c1ba 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.40"; + version = "3.41"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-bFBwv7VmZlw/00ZP0sfrLZIvaGucXj8OqkFSWubD7O4="; + hash = "sha256-CAPteS1zjS6a+/6ZFUZD1WA7dcK8yM4qodVF8PGpTfY="; # 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. diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix index 633adf5286..d695682175 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix @@ -4,6 +4,7 @@ , runCommand , cmake , ffmpeg_4 +, glslang , libdrm , libglvnd , libffi @@ -17,7 +18,10 @@ , ninja , pkg-config , python3 +, spirv-headers +, vulkan-headers , vulkan-loader +, vulkan-utility-libraries , wayland , wayland-protocols , wayland-scanner @@ -39,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.8.3"; + version = "1.3.9.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-+xmbPezWTEwjxX+o2b7FjQcsoWxWe0RTSaTJOrXSIhc="; + hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE="; }; prePatch = '' @@ -55,6 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ${sources.prePatch} + substituteInPlace external/vulkan-validationlayers/CMakeLists.txt \ + --replace-fail 'UPDATE_DEPS ON' 'UPDATE_DEPS OFF' + chmod u+w -R external ''; @@ -68,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: { libXau libXdmcp libxcb + vulkan-headers + vulkan-utility-libraries wayland wayland-protocols zlib @@ -89,6 +98,9 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DWAYLAND_SCANNER=wayland-scanner" + # For vulkan-validation-layers + "-DGLSLANG_INSTALL_DIR=${glslang}" + "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix index a71a900b21..9e0ed7502c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -4,15 +4,15 @@ rec { amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; - hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; + rev = "0f003c2785489f59cd01bb2440fcf303149100f2"; + hash = "sha256-Q3LP8hQrKeM8J0qmJyTeC8Hq949Fe0wOjnkiia+UDag="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "bada5c87ec6db4441db129d8506742c4a72bd610"; - hash = "sha256-GayYjvJ935arbe4GUg8l6KhfImBCpqWRe8xSqlxXLYQ="; + rev = "b9b8fd917b195f680a1ce3f3f663c03e1c82579d"; + hash = "sha256-85kHk1KqhhOqLodRVVpQMhE44IQnzLoFXf/YPNY8aUI="; }; jsoncpp = fetchFromGitHub { @@ -32,27 +32,34 @@ rec { spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64"; - hash = "sha256-POd/TnbVzq/Xyi0O4hU24Qk4LDD5Af2kHJgQ+wPVDsg="; + rev = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7"; + hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "f9184c6501f7e349e0664d281ac93b1db9c1e5ad"; - hash = "sha256-BDnKOUIWZVGPPwmQsMqF1yWy80dl75kdaoztUMnlrqc="; + rev = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7"; + hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "d99193d3fcc4b2a0dacc0a9d7e4951ea611a3e96"; - hash = "sha256-pfPErjZ4jSxEg+OgFcELyvqrS0Hm3QWQ3WhQ9T3rJbQ="; + rev = "dedb71a7edc6d5af3f9bfd5e2ef53814de999ef7"; + hash = "sha256-A61qx7sdcRipX4mHpGJVhd9Qlcv1xcjeGGnfyblMxUg="; + }; + + vulkan-validationlayers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ValidationLayers"; + rev = "f589bc456545fbab97caf49380b102b8aafe1f40"; + hash = "sha256-ZNJGGrUwTw3I0MQl9nKqGhb2bdPZZl+AR3YH3T+cn+c="; }; prePatch = '' - mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs + mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs external/vulkan-validationlayers cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src @@ -61,5 +68,6 @@ rec { cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-tools} external/spirv-tools/src cp -r ${vulkan-docs} external/vulkan-docs/src + cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src ''; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix deleted file mode 100644 index 10e66f1d33..0000000000 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook3, gobject-introspection, keybinder3, xdotool }: - -python3Packages.buildPythonApplication rec { - pname = "emote"; - version = "4.0.1"; - - src = fetchFromGitHub { - owner = "tom-james-watson"; - repo = "Emote"; - rev = "v${version}"; - sha256 = "sha256-+GpL4Rp0ECsxXGP9dWZbVNkH7H2GF1brDTLsB+TQY5A="; - }; - - postPatch = '' - sed -i setup.py -e '/==.*/d' - substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" - substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" - substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" - ''; - - nativeBuildInputs = [ - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - # used by gobject-introspection's setup-hook and only detected at runtime - keybinder3 - ]; - - propagatedBuildInputs = with python3Packages; [ - dbus-python.out # don't propagate dev output - manimpango - pygobject3.out # not listed in setup.py, don't propagate dev output - setproctitle - ]; - - postInstall = '' - install -D snap/gui/emote.desktop $out/share/applications/emote.desktop - install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{emojis.csv,logo.svg,style.css} - ''; - - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix PATH : ${lib.makeBinPath [ xdotool ]} - ) - ''; - - doCheck = false; - - meta = with lib; { - description = "Modern emoji picker for Linux"; - mainProgram = "emote"; - homepage = "https://github.com/tom-james-watson/emote"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ emilytrau SuperSandro2000 ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index d3a6a08761..52bf588a3c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.8.4-rc3"; + version = "0.8.4-rc6"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; rev = "v" + lib.toUpper version; - sha256 = "sha256-P09gXuxbD4RJcXvgnRyFgSxt6NEXfpXJDPzl50ZtAxM="; + sha256 = "sha256-8eBrgUlzrfQkgzr0/Nz/0FQ98UBdV0GQcZhJVbmyOg0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index d0581164d6..1350ce8764 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/third_party/nixpkgs/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.9"; + version = "2.25.10"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-dQifLJjgTKkFYBOJKxGXA1w97UBa0Bh56I6nRk0GVj0="; + hash = "sha256-6kcU6oOH75X/M1+fv3m+r05ffIFYrXrlNl8tB6K+B5I="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix index 979d187803..caa3af446b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { homepage = "https://github.com/asiermarques/adrgen"; description = "Command-line tool for generating and managing Architecture Decision Records"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "adrgen"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix b/third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix index c73d2b758c..80275149bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gstreamer + gst_all_1.gst-plugins-base libnotify libayatana-appindicator ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index b4bf504372..0f6715c8cf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - hash = "sha256-NcDW1SLeP2BVH+TQp1M03Otg75axSFXfwQzlEJ1JOxo="; + hash = "sha256-38r1CwS4BUqhzAUmBvxuqKquGfGlgSekKXe7EbumSe0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix index bb2d88a64e..0b31707759 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix @@ -23,7 +23,7 @@ in appimageTools.wrapType2 { description = "Installer for BetterDiscord"; homepage = "https://betterdiscord.app"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "betterdiscord-installer"; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix index c1030db7a7..aee7cd4425 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { description = "Utility for managing BetterDiscord on Linux"; license = licenses.mit; mainProgram = "betterdiscordctl"; - maintainers = with maintainers; [ ivar bb010g ]; + maintainers = with maintainers; [ bb010g ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index 2ba80d7565..a5c6cf8b68 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.14.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-7l8+WD5/5uBXVnhwqiEScIEQ1dg0W2zqqZJ2AeKCZRU="; + sha256 = "sha256-25GVRZGrYcQ+uo+S45HvX4jrdHKnYuSkXHQUr9NHdyY="; }; nativeBuildInputs = [ autoconf diff --git a/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix b/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix index 2b1a65cf99..382e4d5748 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix @@ -1,29 +1,33 @@ -{ lib, git, python3, fetchFromGitHub }: +{ lib +, git +, python3 +, fetchFromGitHub +}: python3.pkgs.buildPythonApplication rec { pname = "copier"; - version = "9.1.0"; - format = "pyproject"; + version = "9.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "copier-org"; repo = "copier"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # Conflict on APFS on darwin postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA="; + hash = "sha256-fjZ2ieyyFvm5LdCoKLhOffWZusYbZEGebR8o7PDF8wc="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; - nativeBuildInputs = [ - python3.pkgs.poetry-core - python3.pkgs.poetry-dynamic-versioning + build-system = with python3.pkgs; [ + poetry-core + poetry-dynamic-versioning ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ colorama decorator dunamai @@ -51,8 +55,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Library and command-line utility for rendering projects templates"; homepage = "https://copier.readthedocs.io"; + changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer greg ]; + maintainers = with maintainers; [ greg ]; mainProgram = "copier"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index d8428e365f..0b485ad49e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20240412.0"; + version = "20240620.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-MT/EpZ8kDKHhJGF4njdh6Q+xe8GF4FYxaoIighSguiQ="; + pname = "esphome_dashboard"; + inherit version; + hash = "sha256-lx3i8Z2PUefyibCNiQ4zPEwfgXr6r/TVa9TBF0YE5fA="; }; # no tests diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 7dc67ba2ef..ea6e7a3471 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.5.4"; + version = "2024.6.4"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UxNMHRQLrViK9ssFc0vHA/zqNw5yH8E6n+OAnq6vJdQ="; + hash = "sha256-Wdq6sduIjvvLZAumYGmlm3QDaSKqmg/rssQNjdxQuaA="; }; nativeBuildInputs = with python.pkgs; [ @@ -38,9 +38,17 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + pythonRemoveDeps = [ + "esptool" + "platformio" + ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + # drop coverage testing - sed -i '/--cov/d' pytest.ini + sed -i '/--cov/d' pyproject.toml # ensure component dependencies are available cat requirements_optional.txt >> requirements.txt diff --git a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix index 579cabc0b0..1210b7146f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.0.4"; + version = "7.1.1"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-19ZpOpvDj2/qMufH2qPPAj8hRPlViSuC64WqJp6+xSk="; + hash = "sha256-HMpLn73PTk3kwlNof4EZhRHRlHUEfzJt5raYaEqWrjI="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://blog.thms.uk/fedifetcher"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix index f704de4f65..5e38561078 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fsmon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = "refs/tags/${version}"; - hash = "sha256-vAlAnGeFMgLIKaqUusBV7QalYh0+dZdifUvZwebk65U="; + hash = "sha256-m0Bu1lT3KH4ytkpEakI7fvRHV1kmgaXS71+wmNGmEl8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix index aa65da6481..d9ca5eb8ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-9aXGNLaNXzDGJVTAXhOPt8XNxnWUpmiXCa60jsIUja8="; + hash = "sha256-hH5GEVGwnX7i+WFrvHrt379CTQLeCiPQ/eLnQ5oVeec="; }; vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix index 991aa2135f..ca68506faa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grit/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { description = "Multitree-based personal task manager"; homepage = "https://github.com/climech/grit"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "grit"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix index 192c1e3261..489c688880 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { via backlight (currently only for embedded displays) and gamma. Multiple monitors are supported. ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/gwe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gwe/default.nix index 58b116da36..f0e9ad1fdc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gwe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gwe/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { homepage = "https://gitlab.com/leinardi/gwe"; platforms = platforms.linux; license = licenses.gpl3Only; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "gwe"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix index ef64cbea05..f3413e766f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}"; mainProgram = "hx"; license = licenses.mit; - maintainers = with maintainers; [ ivar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix index afa75fca0c..2734f39557 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.13"; + version = "0.3.15"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-3RFiVDXjPFBMK+f/9s9t3cdIH+R/88Fp5uKbo5p2X+g="; + sha256 = "sha256-UmNxdp9acRCKnUsKw7Z9z3knRvVkqQ5atxR/dqpGBYE="; }; - cargoHash = "sha256-MC0Ch9ai4XmhhRz/9nFYEA3A7kgBv2x9q4yc5IJ7CZ8="; + cargoHash = "sha256-pEhogmK2WBj/PxcDtJs/H0XZhPiz3zCQMX2eUcAfnTE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch b/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch deleted file mode 100644 index afbec1d7e4..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 20c3fe76340981c43eeed16a5509480a0f5cb56d Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 6 Aug 2021 10:55:01 +0200 -Subject: [PATCH] Forcefully disable docs build - -This currently affects the following statement in `src/Makefile.am` -only: - - if !DISABLE_DOCUMENTATION - all-local: lnav - if test -w $(srcdir)/internals; then \ - env DUMP_INTERNALS_DIR=$(srcdir)/internals DUMP_CRASH=1 ./lnav Makefile; \ - mv $(srcdir)/internals/*.schema.json $(top_srcdir)/docs/schemas; \ - fi - endif - -We cannot do this (even on non-cross builds) since `lnav` requires e.g. -`/etc/nsswitch.conf` and other impurities here. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ce311fd8..e3c9ebe0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,7 +287,7 @@ AS_IF([test $? -eq 0], - - AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0) - AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"") --AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ]) -+AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ true ]) - - AC_CONFIG_HEADERS([src/config.h]) - AC_CONFIG_FILES([Makefile]) --- -2.31.1 - diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix index 623dcb28c9..55148ad29b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix @@ -15,21 +15,15 @@ stdenv.mkDerivation rec { pname = "lnav"; - version = "0.11.2"; + version = "0.12.2"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; rev = "v${version}"; - sha256 = "sha256-OuxxcXpdpSxrDdiUqRbEaXvCZBAcWvE4YwaMtLKSqCM="; + sha256 = "sha256-grEW3J50osKJzulNQFN7Gir5+wk1qFPc/YaT+EZMAqs="; }; - patches = [ ./0001-Forcefully-disable-docs-build.patch ]; - postPatch = '' - substituteInPlace Makefile.am \ - --replace "SUBDIRS = tools src test" "SUBDIRS = tools src" - ''; - enableParallelBuilding = true; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix index f8a6366cd3..1a39727e99 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; - version = "1.1.11"; + version = "1.1.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFFjv4RWh1JZtxkDmaun35gKi5xty1ifIItwaz3lot4="; + sha256 = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix index a2e7f8a018..d7b9a44290 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mprocs/default.nix @@ -1,29 +1,30 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, nix-update-script, testers, mprocs }: rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "pvolok"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-uwr+cHenV38IsTEW/PQB0kCDsyahiQrBh4s8v8SyEn8="; + repo = "mprocs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gK2kgc0Y0s1xys+pUadi8BhGeYxtyKRhNycCoqftmDI="; }; - cargoSha256 = "sha256-H9oHppG7sew/3JrUtWq2Pip1S9H36qYeHu6x/sPfwV0="; + cargoHash = "sha256-lcs+x2devOEZg5YwAzlZKJl6VpCJXzVqNUr6N5pCei8="; - # Package tests are currently failing (even upstream) but the package seems to work fine. - # Relevant issues: - # https://github.com/pvolok/mprocs/issues/50 - # https://github.com/pvolok/mprocs/issues/61 - doCheck = false; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = mprocs; }; + }; - meta = with lib; { + meta = { description = "TUI tool to run multiple commands in parallel and show the output of each command separately"; homepage = "https://github.com/pvolok/mprocs"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage pyrox0 ]; + changelog = "https://github.com/pvolok/mprocs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage pyrox0 ]; + platforms = lib.platforms.unix; mainProgram = "mprocs"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix b/third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix index 3732d64dd9..80875dec8f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.1.2"; + version = "7.1.3"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-00NZI/KFcgEAkvESnx0KQFW1GvX6FgZLA4Z1Fv2qi+E="; + sha256 = "sha256-4iAFxDAS3gthYPECzyFj0AKzIGwZ9hTJ96fCnQGLbXU="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix index 76d957d340..1b87ca8772 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.2.0"; + version = "0.2.1"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar"; - hash = "sha256-W4WymhjLrHtNK5XY8aahpZOIIh/Qp9scE3zybXF6/9o="; + hash = "sha256-jtaEystCiZUK93HkVPuWzAUISO4RMMxjMmFbooWZJGU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 7d2c992266..b079c6c9be 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.102.0"; + version = "0.103.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-syl4mvh78otLWnDpu/7DHlAq0UqQ+4Alg8tZ16OYBQ4="; + sha256 = "sha256-gunTgELRqPxlywQzI/+0UbXkLeCFAYIf+Mc3vN0Z/6U="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-SEj2waLnThV+anIdtZisJDusTrjObSXNPWIrWoL0gNA="; + vendorHash = "sha256-ZIoEeW8/4/SofZV49hDprwNgXG2mNRbRQBqZHmqy1Hk="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix index 143e340a4c..e5cb03d01d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-1Mw20O64I0UeAOO4Gea8cAbNnHkWOMvoRawIAZ62kTI="; + hash = "sha256-Sq5bHbUxZxgbCmekKVNlgVAXTAxY2sSPgUeFJ/nzkU4="; }; - cargoHash = "sha256-Jx8g49rMatXMV1KvoFGBhXKmf77WR4uE/Xewl5TMeWM="; + cargoHash = "sha256-nEI2boe7bP/c5WKl7LifQNA2VxMvpxGeCyHcwr3aG7E="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index 7cd0a3cabc..1b9986a80d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.28.1"; + version = "2.29.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-pGh1OorNF2fe5rKkszQc2PadrrN/Kpx0+7E5fJERYpQ="; + sha256 = "sha256-5f38D1+nK/yxJSdw4pgCfmWYlgCFxaE9Oey8/UwvR30="; }; - vendorHash = "sha256-lXgTi6hYDBK1QGw8RQoNIHIlmyHPM6z8RYAmbW7N42s="; + vendorHash = "sha256-Uqp+ZEdWDW5sA9EfjYX2ydMGmcGI4rPUINb3D2RlrQY="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix index 28a3e6e535..e699124b2b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qt6gtk2"; - version = "0.2-unstable-2024-05-06"; + version = "0.2-unstable-2024-06-22"; src = fetchFromGitHub { owner = "trialuser02"; repo = finalAttrs.pname; - rev = "d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8"; - hash = "sha256-lIUCdfsmvuzDQaOi2U/CHch1re6Jn6yDfcX26Gu0eUo="; + rev = "2e8729481649d0a2fd4cc07051daf6134809d2c5"; + hash = "sha256-j1PFJEGCd2snQ6bAcsmFNrupoZg+ib/08Xs1oJyWyN0="; }; buildInputs = [ gtk2 qtbase ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix index 4c9650d602..3eb1e59bd0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-DjLQJUaSwglM9mtgKhG+JZ9vHTTfLXy21YLkZiPfTyE="; + hash = "sha256-fsCIyaGCLwf1T8xyVCTjg51TXS8v0l9dBHRB8wdyN5g="; }; - cargoHash = "sha256-un7HE91w4p5+2LrjasKC8/q+nGg8F/6+ZACS5X3OJ1Q="; + cargoHash = "sha256-ZzD+WkmvZX4YXtOwWHw/7t9N/xgKWrMfCThcYFyHG/g="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix index 8cff2ac897..b967159a79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "scdl"; - version = "2.7.9"; + version = "2.7.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/TRRVZc0b7WRjNNe24KdCFyKuaic3I3B5Tnb8ZnMS1o="; + hash = "sha256-XZGFsLnQaYaDUUN4on4JegK8I4UFEGzyvAZWbXU25Ec="; }; build-system = [ python3Packages.setuptools ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix index 4584de1f8f..c60220c034 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sensible-utils"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "sensible-utils"; rev = "debian/${version}"; - sha256 = "sha256-EiWrMDVfauCBHmpJOoJFWOdigtDiNc5DzDoeyWhke9k="; + sha256 = "sha256-omdg5df/TxURarrqawsB3+B85siDJxDaex/2rx5csXI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix index d98225ac36..0238ef46a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.1.1"; + version = "6.1.2"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-AtWzGEegKUDeNLhklm74JNQQqBzdOE4MUYBFp9ubd2A="; + sha256 = "sha256-jAvtcgn51RzO+fkS1LucJs0GOK/x7/7+mWhrNu/dyjg="; }; nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix index 2ea55a3474..143710e3da 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, perl , perlPackages }: @@ -14,6 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-p7rGc9qiRs9U/7SKET6t0gSmFWMOdrU7X2TYGidbd7M="; }; + nativeBuildInputs = [ perlPackages.perl ]; buildInputs = with perlPackages; [ perl IOStringy TestOutput ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index aa1fc40be5..35df5bbf4e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -25,6 +25,30 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests.lvm2) lvm-thinpool-linux-latest; }; + # required for config compatibility with configs done pre 0.9.0 + # see https://github.com/NixOS/nixpkgs/issues/317018 + postInstall = '' + ln -s $out/bin/pdata_tools $out/bin/cache_check + ln -s $out/bin/pdata_tools $out/bin/cache_dump + ln -s $out/bin/pdata_tools $out/bin/cache_metadata_size + ln -s $out/bin/pdata_tools $out/bin/cache_repair + ln -s $out/bin/pdata_tools $out/bin/cache_restore + ln -s $out/bin/pdata_tools $out/bin/cache_writeback + ln -s $out/bin/pdata_tools $out/bin/era_check + ln -s $out/bin/pdata_tools $out/bin/era_dump + ln -s $out/bin/pdata_tools $out/bin/era_invalidate + ln -s $out/bin/pdata_tools $out/bin/era_restore + ln -s $out/bin/pdata_tools $out/bin/thin_check + ln -s $out/bin/pdata_tools $out/bin/thin_delta + ln -s $out/bin/pdata_tools $out/bin/thin_dump + ln -s $out/bin/pdata_tools $out/bin/thin_ls + ln -s $out/bin/pdata_tools $out/bin/thin_metadata_size + ln -s $out/bin/pdata_tools $out/bin/thin_repair + ln -s $out/bin/pdata_tools $out/bin/thin_restore + ln -s $out/bin/pdata_tools $out/bin/thin_rmap + ln -s $out/bin/pdata_tools $out/bin/thin_trim + ''; + meta = with lib; { homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "Suite of tools for manipulating the metadata of the dm-thin device-mapper target"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index dec0e1b453..aa72ecb5d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { 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="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 3b632348f2..8b037912a8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "14.0.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-opTMV+OH8PR9SxBWj1o8xSngK0QdindDcXyd6TRjdvI="; + hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ="; }; - cargoHash = "sha256-pgYrUZAxoyllQp1HuVhbLR3za+Gx0l8Z2/Zq/KCOKZg="; + cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 0e88aa91c8..1b3c920eca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.25"; + version = "0.0.27"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - hash = "sha256-25jmlGxMWzAaJEmMHruA6H+nqx2QHnYX9c9SKqrQRE4="; + hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-lQoOkiSga2aS8GNgLcHdid1/1u3johYEcGi9oOVsdJs="; + hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix index 81c81e6d6f..4ec34be94f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-zNsNEXj/SaJaYsYvoOGPopLhJDfLIXSs7eeZDdJrHiQ="; + hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs="; }; - cargoHash = "sha256-gtqdQuf3Ybt0PDCQw3gGAzIROq39NJKPIat0lyIPGgg="; + cargoHash = "sha256-B1PYLUtBcx35NkU/NR+CmM8bF0hfJWmu11vsovFwR+c="; meta = with lib; { description = "Generator for LS_COLORS with support for multiple color themes"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix index 6c83a45694..be72376a5e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.82"; + version = "0.9.83"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-FqsvU3qt5TwTD6J7WFOgDrHWiDYfU3Y51k8klRCV0kQ="; + hash = "sha256-sdzL5qTYcmMFqZmjsGS/nA7gMtUmzjUg8aiKva0v9dw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index e89628a117..567127a1be 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.211.1"; + version = "1.212.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-xd5/QB6/V8cyoygShmcIzUgXZNs+kBuPtKy56BSoxKo="; + hash = "sha256-7raUPwqCOPywVBCRZbzqtk6qy7hWvBFQ7l0V28UBUI4="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-H3eEwVZB6xzZwW5Bvgs7yPV58QUNvLSWSDigLzs2uG0="; + cargoHash = "sha256-tIber/XmA76NAvLI+qMN0ipkulh945fGoAtf2xUJufA="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix index 0a376aaf78..c5477bb838 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -4,6 +4,7 @@ , xorg , udev , wooting-udev-rules +, makeWrapper }: appimageTools.wrapType2 rec { @@ -15,6 +16,20 @@ appimageTools.wrapType2 rec { sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk="; }; + 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}}" + + install -Dm444 ${contents}/wootility-lekker.desktop -t $out/share/applications + install -Dm444 ${contents}/wootility-lekker.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/wootility-lekker.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=wootility' \ + --replace-warn 'Name=wootility-lekker' 'Name=Wootility' + ''; + profile = '' export LC_ALL=C.UTF-8 ''; @@ -31,8 +46,8 @@ appimageTools.wrapType2 rec { homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; platforms = [ "x86_64-linux" ]; - license = "unknown"; - maintainers = with maintainers; [ davidtwco ]; + license = licenses.unfree; + maintainers = with maintainers; [ davidtwco sodiboo ]; mainProgram = "wootility"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix index 718027b1ef..b98b965e5f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - hash = "sha256-RxEEbyM7wXteYteA4GmvXEraHhm+Kkr2UbYR8G0gO8c="; + hash = "sha256-5d0jI2augBYHKM1H8QXDeBJeG3VoNBdfykU5I4E5xu8="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-ruL1KP3a76DRg0RqpNYz0ZL0V2Ce4v3zt9B/tXyXQs0="; + cargoHash = "sha256-jS4OebCHcg7GG033LairvjXdswKaJI9kg8ycOQmXSME="; meta = with lib; { description = "Extended cp(1)"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix index 67d09807af..e0b7d61616 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-pQhzyXLurFnBn9DkkXA54NsAX8wE4rQvaHXZLkLDwdw="; + sha256 = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; - cargoHash = "sha256-gfCH/jnJTUiqwzxUYuZuFWh9Wq8hp43z2gRdaDQ908g="; + cargoHash = "sha256-R2ng5l2l/5vWnTJ3kt3cURNWL4Lo55yGbSE+9hjQu20="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix index 7c2e100a33..82d0f78257 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "13.0"; + version = "14.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-iYAhiaGfC9/OQ5HrSjX2fhpbwdZun6sxyw8o+8svcvY="; + sha256 = "sha256-gkaWXch+WL1POQrcpB6TRjBXBNeFHDOXWjHp0cHTS5s="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix index 49611df587..4b0254da44 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kira64xyz/yafetch"; description = "Yet another fetch clone written in C++"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ivar ashley ]; + maintainers = with maintainers; [ ashley ]; platforms = platforms.linux; mainProgram = "yafetch"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix index 3a08ec8508..baa1b1a98a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "arping"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-rME4IDzwYHOURbyuG7G5gnXvUIVoQH2WIeLWacHyoBA="; + hash = "sha256-SAdbgPmApmFToYrAm8acUapZMEMQr5MO7bQOTO2hd2c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix index 0953a5e516..587774ec53 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cloud-custodian/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-custodian"; - version = "0.9.36.0"; + version = "0.9.38.0"; pyproject = true; src = fetchFromGitHub { owner = "cloud-custodian"; repo = "cloud-custodian"; rev = "refs/tags/${version}"; - hash = "sha256-cOzh0lNBh35MQx4wg4ssg+haX1kPLVh3GJS27/eKlZI="; + hash = "sha256-jGWPwHiETS4+hk9euLLxs0PBb7mxz2PHCbYYlFfLQUw="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index ba5724d080..4fdeac714a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "10.0.8"; + version = "10.0.9"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-kfvAJT//ZjhjNhKNbaRGjiXO8fsaZZCVZ03BUdD6V6c="; + hash = "sha256-k45p4Y7Y6qle8F1y5sPavuMVem1lPQtNP2CJWq/OGvs="; }; - vendorHash = "sha256-URaU6gy+DOChdbuvUTIWY3cUQTVogD5gUH3p17xmXzE="; + vendorHash = "sha256-QiuAZ7JXvUDlbwkJKZaL6WvOc/HzPOuMfYgA+NBSEMs="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix index 3fb812a38e..59f61d9af7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix @@ -1,32 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rustPlatform -, Security +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, }: rustPlatform.buildRustPackage rec { pname = "fast-ssh"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "julien-r44"; repo = "fast-ssh"; - rev = "v${version}"; - sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE="; }; - cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; - - patches = [ - # Can be removed as soon as this is is merged: https://github.com/Julien-R44/fast-ssh/pull/22 - (fetchpatch { - name = "fix-ambiguous-as_ref.patch"; - url = "https://github.com/Julien-R44/fast-ssh/commit/c082a64a4b412380b2ab145c24161fdaa26175db.patch"; - hash = "sha256-egkoJF+rQiuClNL8ltzmB7oHngbpOxO29rlwZ3nELOE="; - }) - ]; + cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index b16f9601ec..0a8b1c4d95 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.64.2"; + version = "1.65.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ejutUSrDOjNjG0x1DTq8t26C8LoY7OPJsp0r2bX06os="; + hash = "sha256-2HTe7znwXA2IcO4JIvUPHABZXFHUk9iu28/IjjgJ9ks="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix index 38d1e309bc..7f86c8a246 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ipfetch"; - version = "unstable-2022-03-24"; + version = "unstable-2024-02-02"; src = fetchFromGitHub { owner = "trakBan"; repo = "ipfetch"; - rev = "fc295bfda4f9fea6eee9f6f3f2dabc26b6f25be4"; - sha256 = "sha256-YKQ9pRBj2hgPg2ShCqWGxzHs/n7kNhKRNyElRDwHDBU="; + rev = "09b61e0d1d316dbcfab798dd00bc3f9ceb02431d"; + sha256 = "sha256-RlbNIDRuf4sFS2zw4fIkTu0mB7xgJfPMDIk1I3UYXLk="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 9ffa8d1ee0..6b0aa55c81 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-FAmHhMBCG9sezCfp+WvY1klta2BvnGjztQ87arvJTE0="; + sha256 = "sha256-/fO1Lx+QRW42dJ+tkaRNd7y/91YM+1PO/aKC/lXpt1c="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix index b136ee6fd3..5bc536eddc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-v4E1frvjOML3G6vxxYOigpC6m3sYhVxwDvbw8BwBzDk="; + hash = "sha256-/MJTBcKm1DeZ+IGxyz97g7hogtJLizUDzPOPHz9ET3U="; }; vendorHash = "sha256-LqoWkhEnsKTz384dhqNKmZrG38NHxaFx4k7zjHj51Ys="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index b10663216e..5a36439614 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.27.10"; + version = "0.28.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-eliLEyw++NE+OTu4TNJWLptPDVCYUySRciBRoebmXYc="; + hash = "sha256-ue5vMZNLeDAtCa/BzX4aMEcmnxcN41hbmccME8I6VYk="; }; - vendorHash = "sha256-gV/Jx5QEVw2PjMP3BRkZCZ0lo5i8DUddSs+yntfBcTM="; + vendorHash = "sha256-/RfEjTB2n9URhcagasN6yYaejLviv7kHodPo0Y+k3mo="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 22d774f086..034a4847ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.48.0"; + version = "1.48.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-/IC5Qt444ylGjm/B37QKrWp40C3fa47DH5rMZGC4cj8="; + hash = "sha256-PZBxzGKWTd8OMfXQbwYD4XVouMlRFK4ndwNYGt1ahqE="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -131,6 +131,9 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966 + ./without-systemd.patch ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix index aeaf57a137..a7d7aa0732 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,31 +1,32 @@ -{ stdenv -, lib -, fetchurl -, substituteAll -, openvpn -, gettext -, libxml2 -, pkg-config -, file -, networkmanager -, libsecret -, glib -, gtk3 -, gtk4 -, withGnome ? true -, gnome -, kmod -, libnma -, libnma-gtk4 +{ + stdenv, + lib, + fetchurl, + substituteAll, + openvpn, + gettext, + libxml2, + pkg-config, + file, + networkmanager, + libsecret, + glib, + gtk3, + gtk4, + withGnome ? true, + gnome, + kmod, + libnma, + libnma-gtk4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "NetworkManager-openvpn"; - version = "1.10.2"; + version = "1.12.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YvDyqHgiIbkj8hKsKo67wQAu/WqQ7pRdrUrftW0HbSE="; + url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz"; + sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY="; }; patches = [ @@ -42,17 +43,19 @@ stdenv.mkDerivation rec { libxml2 ]; - buildInputs = [ - openvpn - networkmanager - glib - ] ++ lib.optionals withGnome [ - gtk3 - gtk4 - libsecret - libnma - libnma-gtk4 - ]; + buildInputs = + [ + openvpn + networkmanager + glib + ] + ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" @@ -63,16 +66,18 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "NetworkManager-openvpn"; attrPath = "networkmanager-openvpn"; versionPolicy = "odd-unstable"; }; networkManagerPlugin = "VPN/nm-openvpn-service.name"; }; - meta = with lib; { + meta = { description = "NetworkManager's OpenVPN plugin"; + homepage = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"; + changelog = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/blob/main/NEWS"; inherit (networkmanager.meta) maintainers platforms; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/without-systemd.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/without-systemd.patch new file mode 100644 index 0000000000..b48b21da1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/without-systemd.patch @@ -0,0 +1,67 @@ +From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj +--- + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ + .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +index e664a4a720..7ba502086f 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +index 7c20116409..08c1e96b3c 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } +- ++#endif + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; + +-- +GitLab + diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix index 2803d72110..264d07428f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "v${version}"; - hash = "sha256-0ykJruuyD1Z/QcmrogodNlMZp05ocXIo3wdygB/AnT0="; + hash = "sha256-7b0IZLTt9ROEhp9bOBOvNQmS+iuQjgSrdwL1Nxy46t4="; }; - cargoHash = "sha256-Badq3GYr7BoF8VNGGtKTT4/ksuds1zBcSxx5O3vLbzg="; + cargoHash = "sha256-FgRVWo27gdIzUNNTqgu7oHwrKSaWDA+sgL8kGak0otA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ @@ -39,6 +39,10 @@ rustPlatform.buildRustPackage rec { source utils/generate-man.sh ''; + # tests don't compile for 1.1.3 + # https://github.com/pendulum-project/ntpd-rs/actions/runs/9712796372/job/26808251482 + doCheck = false; + checkFlags = [ # doesn't find the testca "--skip=daemon::keyexchange::tests" diff --git a/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix index 00be12a82d..ffc4aad9e6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5Bwe0THxwynuUuw7jI7KBDNC1Q4sHlnWwO2Kx5F/7PA="; + hash = "sha256-Gcl0i3K2ncrxMSLHCPWBleRGdVIVkUo7vcp+tDNpkOw="; } ; - vendorHash = "sha256-SqnFfx9bWneVEIyJS8fKe9NNcbPF4wI3qP5QvENqBrI="; + vendorHash = "sha256-urPMLEaisgndbHmS1sGQ07c+VRBdxIz0wseLoSLVWQo="; # Tests use network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix index cca1fb40bf..85c619aee2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.126.0"; + version = "0.127.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-LkjMxUKTlj3fkSlm1NNOQKVUEz6baqaxMXcI6myaT24="; + hash = "sha256-PPKLQ42V46ybtei0IKefPhpvKylvlj/nlOBJdz3O6Ho="; }; - cargoHash = "sha256-wOBr1U9lekDwG8MntrvR7QtMItJ41kLcyt70N2Uz1M8="; + cargoHash = "sha256-8yOavvkYiYDZAIGe8K892Se0GC32u+09Wh/CC0G8Ss0="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index 855ce3de34..1c60f8f304 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.7p1"; + version = "9.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0="; + hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -29,6 +29,8 @@ in extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch # HPN Patch from FreeBSD ports (fetchpatch { @@ -68,6 +70,8 @@ in extraPatches = [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch (fetchpatch { name = "openssh-gssapi.patch"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch b/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch new file mode 100644 index 0000000000..7b7fb70380 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/935271 +Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. +--- a/log.c ++++ b/log.c +@@ -451,12 +451,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch b/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch new file mode 100644 index 0000000000..90544d1a45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch @@ -0,0 +1,16 @@ +"Minor logic error in ObscureKeystrokeTiming" +https://marc.info/?l=oss-security&m=171982317624594&w=2 +--- a/clientloop.c ++++ b/clientloop.c +@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (timespeccmp(&now, &chaff_until, >=)) { + /* Stop if there have been no keystrokes for a while */ + stop_reason = "chaff time expired"; +- } else if (timespeccmp(&now, &next_interval, >=)) { +- /* Otherwise if we were due to send, then send chaff */ ++ } else if (timespeccmp(&now, &next_interval, >=) && ++ !ssh_packet_have_data_to_write(ssh)) { ++ /* If due to send but have no data, then send chaff */ + if (send_chaff(ssh)) + nchaff++; + } diff --git a/third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix index bb12585155..dfef255c15 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pacparser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pacparser"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "manugarg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qIfzAQ/dJgOZJajNU3XyFudSxu2w4JC0ffHosHXje1o="; + sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks="; }; makeFlags = [ "NO_INTERNET=1" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix index 2e9fff0dd1..fc2d07504e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rabtap/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rabtap"; - version = "1.39.1"; + version = "1.39.3"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-R0OZNmOgklhiljsYTVoqpbMMMaPHICC/qVJNUgkUsfU="; + sha256 = "sha256-5SX6Ma8AMpm642vCGUR1HI6fkKBui16sf7Fm0IpPK6M="; }; - vendorHash = "sha256-BrpDafEFDrH243zDHY9EtkVjPvwrmbJVu5TQMHHOWfA="; + vendorHash = "sha256-wZOkQjSPMZW3+ohZb+MlBWNU3WTL4/lqggAOJLrYFHc="; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index cc261d1cfd..85dc1c3896 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.19.2"; + version = "1.20.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-Mru6HUq0er3zIpyaFcbFfyaoYvD+YHgU+kGp9yW5ia0="; + hash = "sha256-cPdm8ZtZ4MDbrnTasnF1NANYtVwVcs6MGWFRnpD7Rq0="; }; - cargoHash = "sha256-mx//rLIsxrGV1nh8HR/Dg+SPRdSapmvulM1nYuHJzg0="; + cargoHash = "sha256-IMT+IuzNV880XIAXv9NGZxqj4VyY8U137nkHL5N8yZc="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix index 619a3c773b..12325afc48 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-aVGIgQkFz8A1UsHsgOSkEEE5vzp4cJEtcaKHv1EzErg="; + hash = "sha256-7JNP8vacYENBbbCxBtSpVu9j5vCBVBsQ/OeVPoRxlE4="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix index 16c6a40bb3..2cb9f3b62a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2023.10"; + version = "2024.06"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-oCHPRqJ1zm2Ple3Ck9nMyRC7PgKaF1RuswzdGBVU2C8="; + sha256 = "sha256-iCW0oEbLLqRKaxqxhSDsmRnI5YTi4HYcg+IWRAbt9WI="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 35629c261f..8dfcf19e52 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-zk6HyZfYeJecJgdMU3qnXIKDYuvnu5yjSZtVvKem4uI="; + hash = "sha256-hszaYU0bKd6gtQE57YaorAIZ4IKqoa2+PAgENUCBoVA="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-wvzrnwzkV4SXsiZfIrowMF0G7qFdjEVrF77vM81rxLs="; + vendorHash = "sha256-MMI44rfOk8BXxyxhb/OLKjwwe0Zc6UY3xkCbbBL4MS8="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix b/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix index 1d860bc753..909648f8d0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "twa"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = "v${version}"; - hash = "sha256-8c1o03iwStmhjKHmEXIZGyaSOAJRlOuhu0ERjCO5SHg="; + hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix index cd686a9bd5..ed4f2b7d3c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { pname = "wgautomesh"; - version = "0.1.0"; + version = "unstable-20240524"; src = fetchFromGitea { domain = "git.deuxfleurs.fr"; owner = "Deuxfleurs"; repo = "wgautomesh"; - rev = "v${version}"; - sha256 = "FiFEpYLSJg52EtBXaZ685ICbaIyY9URrDt0bS0HPi0Q="; + rev = "59d315b853d4251dfdfd8229152bc151655da438"; + hash = "sha256-1xphnyuRMZEeq907nyhAW7iERYJLS1kxH0wRBsfYL40="; }; - cargoHash = "sha256-DGDVjQ4fr4/F1RE0qVc5CWcXrrCEswCF7rQQwlKzMPA="; + cargoHash = "sha256-HZ1VImsfxRd0sFN/vKAKgwIV2eio2GiEz+6c1+dCmdk="; meta = with lib; { description = "Simple utility to help connect wireguard nodes together in a full mesh topology"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch new file mode 100644 index 0000000000..475655f94a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch @@ -0,0 +1,32 @@ +From f71d88a15f537cbc5ea80ad2922c013553a5caab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Fri, 21 Jun 2024 14:43:03 +0200 +Subject: [PATCH 2/2] darwin: disable link-time optimization +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's not yet clear to me, but in our build we somehow mix objects with +and without flto. + +Signed-off-by: Jörg Thalheim +--- + make-mac.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/make-mac.mk b/make-mac.mk +index 7af200ad..b388c05a 100644 +--- a/make-mac.mk ++++ b/make-mac.mk +@@ -84,7 +84,7 @@ ifeq ($(ZT_DEBUG),1) + node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS) + else + CFLAGS?=-Ofast -fstack-protector-strong +- CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) ++ CFLAGS+=$(ARCH_FLAGS) -Wall -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) + STRIP=strip + EXTRA_CARGO_FLAGS=--release + RUST_VARIANT=release +-- +2.44.1 + diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index fa2c86d6f8..6f34be09b8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -10,6 +10,9 @@ , ronn , rustc , zlib +, libiconv +, darwin +, fetchpatch }: let @@ -33,8 +36,17 @@ in stdenv.mkDerivation { "rustfsm-0.1.0" = "sha256-q7J9QgN67iuoNhQC8SDVzUkjCNRXGiNCkE8OsQc5+oI="; }; }; + patches = [ + # https://github.com/zerotier/ZeroTierOne/pull/2314 + (fetchpatch { + url = "https://github.com/zerotier/ZeroTierOne/commit/f9c6ee0181acb1b77605d9a4e4106ac79aaacca3.patch"; + hash = "sha256-zw7KmaxiCH99Y0wQtOQM4u0ruxiePhvv/birxMQioJU="; + }) + ./0001-darwin-disable-link-time-optimization.patch + ]; postPatch = "cp ${./Cargo.lock} Cargo.lock"; + preConfigure = '' cmp ./Cargo.lock ./rustybits/Cargo.lock || { echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./rustybits/Cargo.lock!" @@ -57,10 +69,15 @@ in stdenv.mkDerivation { cargo rustc ]; + buildInputs = [ lzo openssl zlib + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.SystemConfiguration + darwin.apple_sdk.frameworks.CoreServices ]; enableParallelBuilding = true; @@ -68,10 +85,25 @@ in stdenv.mkDerivation { # Ensure Rust compiles for the right target env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget; - # Cargo won't compile to target/release but to target//release when a target is - # explicitly defined. The build-system however expects target/release. Hence we just symlink from - # the latter to the former. - preBuild = '' + preBuild = if stdenv.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" + exit 1 + fi + (cd rustybits && MACOSX_DEPLOYMENT_TARGET=10.13 cargo build -p zeroidc --release) + + cp \ + ./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \ + ./rustybits/target + + # zerotier uses the "FORCE" target as a phony target to force rebuilds. + # We don't want to rebuild libzeroidc.a as we build want to build this library ourself for a single architecture + touch FORCE + '' else '' + # Cargo won't compile to target/release but to target//release when a target is + # explicitly defined. The build-system however expects target/release. Hence we just symlink from + # the latter to the former. mkdir -p rustybits/target/release ln -rs \ ./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \ @@ -87,7 +119,11 @@ in stdenv.mkDerivation { runHook postCheck ''; - installFlags = [ "DESTDIR=$$out/upstream" ]; + installFlags = [ + # only linux has an install target, we borrow this for macOS as well + "-f" "make-linux.mk" + "DESTDIR=$$out/upstream" + ]; postInstall = '' mv $out/upstream/usr/sbin $out/bin @@ -106,7 +142,10 @@ in stdenv.mkDerivation { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = "https://www.zerotier.com"; license = licenses.bsl11; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = platforms.linux; + maintainers = with maintainers; [ + sjmackenzie zimbatm ehmry obadz danielfullmer + mic92 # also can test darwin + ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix index 5da30808d7..e4e5a1a22f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-9r4a9j8d194VpCCuviQGfWCLzGhE9pnAMkgCkSXOAnE="; - aarch64-linux = "sha256-be/Yx7BatT1kJLGkCoTMrIP6TJW1FFQnHxUjnK3Hw3A="; - armv7l-linux = "sha256-xnQ1FrHkKhY9gEfhXsgbVoRIodL5PlOSNUrUKwVh510="; + x86_64-linux = "sha256-1CdYmFKpjc3CAmHwpSJ3IL4ZrJqYo0QZ4a/yRy732IM="; + aarch64-linux = "sha256-Du/Kyb4UafEK3ssfWB3w0harAxUIlmsc5SGsxf1Dc18="; + armv7l-linux = "sha256-59tQ5sNk0QL1H+BjeiiJItTQUNWCNuWCp0wWe//VEhg="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.30"; + version = "0.4.32"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index 29be340981..da046f8afc 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-6aPfpkcUoAYaGYqBPFJJQvQ9dMGne9TWJ2HAx95JujY="; + sha256 = "sha256-9gBrFudzn75rzx7bTPgr+zzUpX2cLHOmE12xFtoH1eA="; }; - cargoHash = "sha256-5bWP8dhApnQyK/gQNkPrLeqFvRVbSlVNRG6pRDb/fdk="; + cargoHash = "sha256-/f67AhaNLHS/3veAzNZwYujMMM/Vmq/U4MHNHvfRoBE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix index e1431532f8..c98bae7e44 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jonringer/nix-template/"; changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; license = licenses.cc0; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "nix-template"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix index 22b1cb817b..f7b0dff334 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -19,6 +19,7 @@ let atLeast219 = lib.versionAtLeast version "2.19pre"; atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast221 = lib.versionAtLeast version "2.21pre"; + atLeast224 = lib.versionAtLeast version "2.24pre"; # Major.minor versions unaffected by CVE-2024-27297 unaffectedByFodSandboxEscape = [ "2.3" @@ -58,6 +59,7 @@ in , libxml2 , libxslt , lowdown +, toml11 , man , mdbook , mdbook-linkcheck @@ -136,6 +138,8 @@ self = stdenv.mkDerivation { lowdown ] ++ lib.optionals atLeast220 [ libgit2 + ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ + toml11 ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals (stdenv.isx86_64) [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index 87077b42d9..3290b0e71b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -147,49 +147,49 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.3"; - hash = "sha256-430V4oN1Pid0h3J1yucrik6lbDh5D+pHI455bzLPEDY="; + version = "2.18.4"; + hash = "sha256-tebjp83ABKrBW3d/6n/Irr1+xhtw8qIkqHZHJOoJaLk="; self_attribute_name = "nix_2_18"; }; nix_2_19 = common { - version = "2.19.4"; - hash = "sha256-qXjyVmDm1SFWk1az3GWIsJ0fVG0nWet2FdldFOnUydI="; + version = "2.19.5"; + hash = "sha256-n4efeDi8KtLgkAKl5kBQ4svmdxfnRp8KrSZGrlFsr/E="; self_attribute_name = "nix_2_19"; }; nix_2_20 = common { - version = "2.20.6"; - hash = "sha256-BSl8Jijq1A4n1ToQy0t0jDJCXhJK+w1prL8QMHS5t54="; + version = "2.20.7"; + hash = "sha256-hWElUtAHYbL/LjyW0Vovz9zJLhv5zC6/tDu8uPkbQqY="; self_attribute_name = "nix_2_20"; }; nix_2_21 = common { - version = "2.21.2"; - hash = "sha256-ObaVDDPtnOeIE0t7m4OVk5G+OS6d9qYh+ktK67Fe/zE="; + version = "2.21.3"; + hash = "sha256-oaRT9rGrYKxebZ6aiBFTx2OwcIDQthkzRdeez3EARH4="; self_attribute_name = "nix_2_21"; }; nix_2_22 = common { - version = "2.22.1"; - hash = "sha256-5Q1WkpTWH7fkVfYhHDc5r0A+Vc+K5xB1UhzrLzBCrB8="; + version = "2.22.2"; + hash = "sha256-/ABtOUnfN6od/MtLxO5cJX90Ags/vOBQav6MyhKy4r4="; self_attribute_name = "nix_2_22"; }; nix_2_23 = common { - version = "2.23.0"; - hash = "sha256-cRCwRDxR8rEQQEvGjIH8g0krJd4ZFJrdgmPXkv65S/Y="; + version = "2.23.1"; + hash = "sha256-US+UsPhFeYoJH0ncjERRtVD1U20JtVtjsG+xhZqr/nY="; self_attribute_name = "nix_2_23"; }; git = common rec { - version = "2.23.0"; - suffix = "pre20240526_${lib.substring 0 8 src.rev}"; + version = "2.23.1"; + suffix = "pre20240627_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "7de033d63fbcf97aad164e131ae3a85e5dcebce7"; - hash = "sha256-LtsyUsVpr9sM0n1L7MeTw8/6wGtGeXFvKAbPR5lqN8Q="; + rev = "b44909ac2244bda4c387b9a17748e8a94ada9e78"; + hash = "sha256-tS8i/fyi2DO5GM103b+G7K/XwFWhWvb2VDjqpLH5Kxc="; }; self_attribute_name = "git"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix index 2b64480c4a..5cb9659656 100644 --- a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-11dqfOi/DdfFrFTeboPyFkixXG+fCJ2jpHM55qsQ1jw="; + sha256 = "sha256-FoERgkyFCZ1nU01LXpzrqz9eJ9a16L/t+9g8jsABHK4="; }; - cargoHash = "sha256-u0vceIurenYnKfF3gWNw304hX4vVFoszZD7AMwffOmc="; + cargoHash = "sha256-Joy+SO1zR78Eh5eK2bxyT0l3hCuLX/J3u/UvN+++6vg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix index 8a00d80c0e..e9a4680a0b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-1+Wt2qhwYrkU50lGuL55UnCpFF+ROV2fzFwFDP1eHjo="; + hash = "sha256-yyb5v5dKgl5/45GNZKNXpJUfj5eAksSKoTOEL6ZL29s="; }; - cargoHash = "sha256-vuEs1mtrn4fXwBpvPsQr3z6hTAlggVsPUK3ZZ2DmhEs="; + cargoHash = "sha256-xoZ55ngIKcM9WQZeZUBprJE7tGOmaI2tWlFc/AoRbxA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix index 1c2c52fd00..84a0cf709b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "asnmap"; rev = "refs/tags/v${version}"; - hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw="; + hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM="; }; - vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA="; + vendorHash = "sha256-bSpMYQvrlR9T06dYF8gaTZmMAp6Gnb2cfsYCUes7i2s="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix index cb66250ce7..357f097a15 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.9.1"; + version = "11.10.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-EuYkjVaZmV2/DxrKgrfZraMZs5eVZRbNhCVvRtCoAK8="; + hash = "sha256-t8TuFjNpsVE5Xq3EloUAJH8ZqiCbZlIm9yzWTGr+E98="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-VuJlc1qQSGu+9G3PkoE+Qz6UOv524xZPv+lYzK1Y9VY="; + vendorHash = "sha256-npnZ/eTfA6GVga6p9XKMMU6YbECN657QMMEQA/pgLfc="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix index e3c1121271..7f686fb37b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.9.1"; + version = "11.10.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-8i2oNeFxpxhFxFlJR3ib0M1W9NNtqgGjlnKsqzLkf68="; + hash = "sha256-tV7QDa7XSkr+HwegOwEnOjtn1IrLhE0PfrhjjRz0JbM="; }; proxyVendor = true; - vendorHash = "sha256-va23lTCCL/4EpTkBPH+rqZj4f+O4vAg2/nXGMEDNGXU="; + vendorHash = "sha256-KS+fuoLFueI5cHQLiM1g6Qxq4UFKNVGauvchx2aP+RY="; subPackages = [ "apps/cnspec" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 086927a43f..c74c2aa6b0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-15"; + version = "2024-06-27"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-bETNSUv36GobOke1bwE+uTSRqln3kANqfl8UIx7bdjM="; + hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix index 2a44e8186e..ad451c076d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-agent-dispatcher"; - version = "3.4.1"; + version = "3.4.2"; pyproject = true; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; rev = "refs/tags/${version}"; - hash = "sha256-b62WO1+5EWzsTCzeZPX9T+ho8Sig46lH/9dPmGGhPWA="; + hash = "sha256-Qr3ZGU4y7f6yHD78ecdv7a6IBFDpT+/4Yez0n/MenN0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix index aba9ce1c22..22e3921be7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.28.0"; + version = "1.29.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-iayxm234Rvi5O0Vb0RCid0iAvRQ2fCjoKAQVJY/9nbE="; + hash = "sha256-x37FRSjhqV7LxD8VFSmVjg/FPlxsa4NEX6y7OEAniF4="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix index ba23647c9c..2a3bb65f8a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -1,25 +1,27 @@ -{ stdenv -, fetchFromGitHub -, lib -, callPackage -, gradle_7 -, perl -, makeBinaryWrapper -, openjdk17 -, unzip -, makeDesktopItem -, copyDesktopItems -, desktopToDarwinBundle -, icoutils -, xcbuild -, protobuf -, ghidra-extensions +{ + stdenv, + fetchFromGitHub, + lib, + callPackage, + gradle_7, + perl, + makeBinaryWrapper, + openjdk17, + unzip, + makeDesktopItem, + copyDesktopItems, + desktopToDarwinBundle, + xcbuild, + protobuf, + ghidra-extensions, + python3, + python3Packages, }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.0.3"; + version = "11.1.1"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -27,7 +29,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-IiLxaJvfJcK275FDZEsUCGp7haJjp8O2fUIoM4F9H30="; + hash = "sha256-t96FcAK3JwO66dOf4OhpOfU8CQfAczfF61Cg7m+B3fA="; # 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; @@ -76,26 +78,26 @@ let # Adds a gradle step that downloads all the dependencies to the gradle cache. addResolveStep = '' - cat >>build.gradle < - subProject.buildscript.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") - } - subProject.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "config \''${configuration.name}") + cat >>build.gradle < + subProject.buildscript.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") + } + subProject.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "config \''${configuration.name}") + } + } } } - } -} -void resolveConfiguration(subProject, configuration, name) { - if (configuration.canBeResolved) { - logger.info("Resolving project {} {}", subProject.name, name) - configuration.resolve() - } -} -HERE + void resolveConfiguration(subProject, configuration, name) { + if (configuration.canBeResolved) { + logger.info("Resolving project {} {}", subProject.name, name) + configuration.resolve() + } + } + HERE ''; # fake build to pre-download deps into fixed-output derivation @@ -106,7 +108,10 @@ HERE postPatch = addResolveStep; - nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = [ + gradle + perl + ] ++ lib.optional stdenv.isDarwin xcbuild; buildPhase = '' runHook preBuild export HOME="$NIX_BUILD_TOP/home" @@ -132,11 +137,23 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-nKfJiGoZlDEpbCmYVKNZXz2PYIosCd4nPFdy3MfprHc="; + outputHash = "sha256-66gL4UFlBUo2JIEOXoF6tFvXtBdEX4b2MeSrV1b6Vg4="; }; +in +stdenv.mkDerivation (finalAttrs: { + inherit + pname + version + src + patches + postPatch + ; -in stdenv.mkDerivation (finalAttrs: { - inherit pname version src patches postPatch; + # Don't create .orig files if the patch isn't an exact match. + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; desktopItems = [ (makeDesktopItem { @@ -150,16 +167,20 @@ in stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - gradle - unzip - makeBinaryWrapper - copyDesktopItems - protobuf - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild - desktopToDarwinBundle - ]; + nativeBuildInputs = + [ + gradle + unzip + makeBinaryWrapper + copyDesktopItems + protobuf + python3 + python3Packages.pip + ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild + desktopToDarwinBundle + ]; dontStrip = true; @@ -211,7 +232,10 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { inherit releaseName distroPrefix; - inherit (ghidra-extensions.override { ghidra = finalAttrs.finalPackage; }) buildGhidraExtension buildGhidraScripts; + inherit (ghidra-extensions.override { ghidra = finalAttrs.finalPackage; }) + buildGhidraExtension + buildGhidraScripts + ; withExtensions = callPackage ./with-extensions.nix { ghidra = finalAttrs.finalPackage; }; }; @@ -221,14 +245,21 @@ in stdenv.mkDerivation (finalAttrs: { description = "Software reverse engineering (SRE) suite of tools"; mainProgram = "ghidra"; homepage = "https://ghidra-sre.org/"; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; license = licenses.asl20; - maintainers = with maintainers; [ roblabla vringar ]; + maintainers = with maintainers; [ + roblabla + vringar + ]; broken = stdenv.isDarwin && stdenv.isx86_64; }; - }) diff --git a/third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix index 38014988dd..0aaa91611e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hashrat/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "hashrat"; - version = "1.15"; + version = "1.21"; src = fetchFromGitHub { owner = "ColumPaget"; repo = "Hashrat"; rev = "v${version}"; - hash = "sha256-+3IPCJS++7CE0ZrJb62LCRrAn2J4uCF3a1oOzDoOW0w="; + hash = "sha256-WWUUwbAt2vxbXSj7r/kVDc85jhkikNeqUtITZepH8Dc="; }; configureFlags = [ "--enable-xattr" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index cfc4444182..e31381ff33 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-EvpCJx5OtWOM/TIz45+8lvkphnyGiI7P7hvFeuNmGfM="; + hash = "sha256-c+o+T2CWIqibjTn5zuTKCvdYVvmgzSQoQVOLiqdRHHU="; }; - vendorHash = "sha256-0e8P6pMvtEj28j7BQlNPkW/XpjSVBnKP/Dli+oU+J10="; + vendorHash = "sha256-ia8sxoldJiMbnerodUz+SEuUWRqSzJfO737TmfO8aL4="; subPackages = [ "cmd/httpx" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/john/default.nix b/third_party/nixpkgs/pkgs/tools/security/john/default.nix index b06e0f3ec6..aeefcaa0bb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/john/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/john/default.nix @@ -1,5 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 -, gcc, python3Packages, perl, perlPackages, makeWrapper, }: +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + nss, + nspr, + libkrb5, + gmp, + zlib, + libpcap, + re2, + gcc, + python3Packages, + perl, + perlPackages, + withOpenCL ? true, + opencl-headers, + ocl-icd, + substituteAll, + makeWrapper, +}: stdenv.mkDerivation rec { pname = "john"; @@ -12,6 +32,13 @@ stdenv.mkDerivation rec { hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc="; }; + patches = lib.optionals withOpenCL [ + (substituteAll { + src = ./opencl.patch; + ocl_icd = ocl-icd; + }) + ]; + postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! @@ -23,25 +50,61 @@ stdenv.mkDerivation rec { }' run/*.conf ''; - preConfigure = '' - cd src - # Makefile.in depends on AS and LD being set to CC, which is set by default in configure.ac. - # This ensures we override the environment variables set in cc-wrapper/setup-hook.sh - export AS=$CC - export LD=$CC - ''; + preConfigure = + '' + cd src + # Makefile.in depends on AS and LD being set to CC, which is set by default in configure.ac. + # This ensures we override the environment variables set in cc-wrapper/setup-hook.sh + export AS=$CC + export LD=$CC + '' + + lib.optionalString withOpenCL '' + python ./opencl_generate_dynamic_loader.py # Update opencl_dynamic_loader.c + ''; configureFlags = [ "--disable-native-tests" "--with-systemwide" ]; - buildInputs = [ openssl nss nspr libkrb5 gmp zlib libpcap re2 ]; - nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; - propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py - (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl - CompressRawLzma # For 7z2john.pl - perlldap ]); # For sha-dump.pl - # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl + buildInputs = + [ + openssl + nss + nspr + libkrb5 + gmp + zlib + libpcap + re2 + ] + ++ lib.optionals withOpenCL [ + opencl-headers + ocl-icd + ]; + nativeBuildInputs = [ + gcc + python3Packages.wrapPython + perl + makeWrapper + ]; + propagatedBuildInputs = + # For pcap2john.py + (with python3Packages; [ + dpkt + scapy + lxml + ]) + ++ (with perlPackages; [ + # For pass_gen.pl + DigestMD4 + DigestSHA1 + GetoptLong + # For 7z2john.pl + CompressRawLzma + # For sha-dump.pl + perlldap + ]); + # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john # gcc: error: memdbg.o: No such file or directory @@ -70,7 +133,11 @@ stdenv.mkDerivation rec { description = "John the Ripper password cracker"; license = licenses.gpl2Plus; homepage = "https://github.com/openwall/john/"; - maintainers = with maintainers; [ offline matthewbauer cherrykitten ]; + maintainers = with maintainers; [ + offline + matthewbauer + cherrykitten + ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/john/opencl.patch b/third_party/nixpkgs/pkgs/tools/security/john/opencl.patch new file mode 100644 index 0000000000..575bfa8263 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/john/opencl.patch @@ -0,0 +1,18 @@ +diff --git a/src/opencl_generate_dynamic_loader.py b/src/opencl_generate_dynamic_loader.py +index 790705330..2acedbc56 100755 +--- a/src/opencl_generate_dynamic_loader.py ++++ b/src/opencl_generate_dynamic_loader.py +@@ -134,12 +134,7 @@ static void load_opencl_dll(void) + + /* Names to try to load */ + const char * const opencl_names[] = { +- "libOpenCL.so", /* Linux/others, hack via "development" sub-package's symlink */ +- "OpenCL", /* _WIN */ +- "/System/Library/Frameworks/OpenCL.framework/OpenCL", /* __APPLE__ */ +- "opencl.dll", /* __CYGWIN__ */ +- "cygOpenCL-1.dll", /* __CYGWIN__ */ +- "libOpenCL.so.1" /* Linux/others, no "development" sub-package installed */ ++ "@ocl_icd@/lib/libOpenCL.so" /* NixOS */ + }; + + for (i = 0; i < sizeof(opencl_names)/sizeof(opencl_names[0]); i++) { diff --git a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix index 169165067c..3f503ec6c4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -19,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { "beautifulsoup4" "dnspython" "pyopenssl" + "requests" "tqdm" ]; - build-system = with python3.pkgs; [ - pythonRelaxDepsHook - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ beautifulsoup4 @@ -38,15 +39,13 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "knock" - ]; + pythonImportsCheck = [ "knock" ]; meta = with lib; { description = "Tool to scan subdomains"; homepage = "https://github.com/guelfoweb/knock"; changelog = "https://github.com/guelfoweb/knock/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "knockpy"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index d0f8415cbe..d4827d0f59 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -21,7 +21,8 @@ buildGoModule rec { fetchSubmodules = true; }; - vendorHash = "sha256-iwcwhBX/Kl55G8SrI1mmkP5bj8BrLAGBdk3UnK1Xfag="; + proxyVendor = true; + vendorHash = "sha256-JWpviZqegrIUIOtGG6yvDGxq30TUw+fZcqCJevYqxvY"; subPackages = [ "." ]; @@ -89,6 +90,5 @@ buildGoModule rec { jk ]; mainProgram = "kubescape"; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 55597617ab..1255467932 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/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.14" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.15" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 877afc8a4f..f8839316b6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 685168ecf3266361a8e7836b2a7889751b7d20b8 - ref: refs/tags/6.4.14 + revision: b4a408704631fd0a0a4587f1f1a0017bcec9fb45 + ref: refs/tags/6.4.15 specs: - metasploit-framework (6.4.14) + metasploit-framework (6.4.15) aarch64 abbrev actionpack (~> 7.0.0) @@ -44,7 +44,7 @@ GIT metasploit-model metasploit-payloads (= 2.0.166) metasploit_data_models - metasploit_payloads-mettle (= 1.0.26) + metasploit_payloads-mettle (= 1.0.28) mqtt msgpack (~> 1.6.0) mutex_m @@ -280,7 +280,7 @@ GEM railties (~> 7.0) recog webrick - metasploit_payloads-mettle (1.0.26) + metasploit_payloads-mettle (1.0.28) method_source (1.1.0) mini_portile2 (2.8.6) minitest (5.23.1) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index e5844a6550..6bd3bf152e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.14"; + version = "6.4.15"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-aUxHCeRBlE0CQuroxge9A/O1LA9DfQJwuwWZsPUKz1A="; + hash = "sha256-CJXti/pX2Q59fJgRbAodUDMlMHIJH0eh3kOZxrQEllY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index ee76850346..c191898581 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "685168ecf3266361a8e7836b2a7889751b7d20b8"; - sha256 = "0l6g1bsv1685pdq04za31wnbbwq3pl3wds7a8814v521wh4lfk39"; + rev = "b4a408704631fd0a0a4587f1f1a0017bcec9fb45"; + sha256 = "0mln0jscd6a3vshlf7q9f8q2acsh3l56q4cqgiyhxnapza5yv588"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.14"; + version = "6.4.15"; }; metasploit-model = { groups = ["default"]; @@ -766,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qprmbmpw4c8396m0whbp08xzdbjc0s2zd0jkxqnh3aswmx8pj3m"; + sha256 = "0649y1zc2pncfalsa5nkszmbiz1gfg4q3bhh4p2q6vwaac5g6sfj"; type = "gem"; }; - version = "1.0.26"; + version = "1.0.28"; }; method_source = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix index 7b2fca55d9..12b73a585b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-JqSsFEZmmVOnNza9xh+JrlWxE4XdA1GSX9yw2NIPYhQ="; + hash = "sha256-2XbqpvtlNAYrgtaMnFklYRoHCj3nkltEZlwbZzvfdFU="; }; - vendorHash = "sha256-MiBY4kWBZM2ZcW3SMqQ+7gKFnFt78wMI9S3OfCgth5g="; + vendorHash = "sha256-PKoe4rpwPy3omfRRhN70iEJJ/sHliIwxPUHGxRJqrf4="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/third_party/nixpkgs/pkgs/tools/security/notary/no-git-usage.patch b/third_party/nixpkgs/pkgs/tools/security/notary/no-git-usage.patch deleted file mode 100644 index 363eefe369..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/notary/no-git-usage.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index ab794165..0cbd047f 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) - # Add to compile time flags - NOTARY_PKG := github.com/theupdateframework/notary - NOTARY_VERSION := $(shell cat NOTARY_VERSION) --GITCOMMIT := $(shell git rev-parse --short HEAD) --GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) -+GITCOMMIT ?= $(shell git rev-parse --short HEAD) -+GITUNTRACKEDCHANGES := - ifneq ($(GITUNTRACKEDCHANGES),) - GITCOMMIT := $(GITCOMMIT)-dirty - endif diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix index c88e1d2b06..36a1cb2847 100644 --- a/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; }; - propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ]; + propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli setuptools ]; # move the python library into the sitePackages. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix b/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix index 32be96f853..30f7599240 100644 --- a/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.7.4"; + version = "1.8.1"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5dRXVbisVoTeS/KVS2tnpaL0i9DMFZYu+vHGWQ1Mvc="; + hash = "sha256-Hk5W55xBIAwbpHgkI5bvQYkebwPfEkyKhXuysKsbNgQ="; }; - vendorHash = "sha256-6soB9XLh+ez+iGrnDYh1qrz94KQCoUJPiQA8Cv0oz+o="; + vendorHash = "sha256-uc1+TDqrwiRnvS59GpypO3US54Ip5LrOQYEsyHhDDwk="; subPackages = [ "cmd/osv-scanner" diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix index 45c817c697..6d623f5816 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pinentry-rofi"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; - sha256 = "sha256-J6aQTIFHlg21M9niBYdVih11heIPCLsGv0HOPaeguew="; + sha256 = "sha256-e7dpMivZrTHmRuAzBzDVRoUgvBt6NpZ43FRQtX2omHA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 596257f90c..e46b742ee1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.10.2"; + version = "1.11.1"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - hash = "sha256-ScVXtNk2QtfAQn6PtQkbDJNLWAu49l55s6Zpf1fiVjM="; + hash = "sha256-fk54jeAgOVF3KjkqkQL61aszhAAvLibZnI2w+irLK2s="; }; - cargoHash = "sha256-ii0401TTDm1ySRGOcSmPts/10wTguxsx8h7wA4FsgQk="; + cargoHash = "sha256-MHNc8MjKbisgCRulO7xSiurHlp60rytPqxiGEV7TLMY="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix index 861167c15a..82e4d3624d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/spiffe/spire"; changelog = "https://github.com/spiffe/spire/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer fkautz ]; + maintainers = with maintainers; [ fkautz ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 4bbd65c09b..6d012096b4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.78.2"; + version = "3.79.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-s+8l203ntPsp54yZpEX2wz8Dt/p3rokfu6KI8LSwpko="; + hash = "sha256-YgalvCAhtL0y2bVqeI0w/n5eVMIW2QPPbm9zpBzzuAM="; }; - vendorHash = "sha256-0YNvqJlSF6TIGSbQrAu47G2oXPY9+2wiZbDP94oAaVA="; + vendorHash = "sha256-fBcBY6P2V2ZkBDqCLk5AMBtGF1vTZzZ8ohxc1BPTSVQ="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix b/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix index 7bb56ce214..70dd968456 100644 --- a/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iBZwR4hEd1pmmq4WzY/kfwHmpFj/MG+xGitbIQI8K5I="; + hash = "sha256-avGbawIeh7ZUtacRLo/tLz4D6U7JAlu9BXDYu/xvoa0="; }; - vendorHash = "sha256-cf9Itdz1hR74TVoFOsOdUcrvEuT57RZn2tgrEXU4c8E="; + vendorHash = "sha256-93iXho+WCQyhw9DoLgo9ZKiPrd88D2ibgp1M9uP7bUU="; meta = with lib; { description = "API wrapper to search for exposed hosts"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix index ff7f8246ef..0d0d1070bb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-L0T0Lu5UP/KG2jdJfw5lM6/FagZUpMLGNWyf4tktzmQ="; + sha256 = "sha256-RCvqoikROFpFvza24PGocdxFaOI6hZLSy3Jnag7Oz4s="; }; - vendorHash = "sha256-7ethl7BL6JBzIbyvpUE2TdvvPWs/CUvJQhjH2P5UCTY="; + vendorHash = "sha256-iKfNAQRsVUjhUmDH/HevnDnocQm4k9jEfW40+AncojM="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 6efce59221..e2495db96b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-jnX3sJJIe62y5p5w7xs5IQ5xE/9aWzM02H2x/p7E9gc="; + hash = "sha256-BpiMgLO75zImJJbFgoW6FauJIOin1oSLvm2qmKZONqY="; }; - vendorHash = "sha256-r2tDPAPM8wPWRaArsjf5YcERyy3pwmIM4Wx2HSUdFEg="; + vendorHash = "sha256-gSQjd59drhG0ZkiKTNQX7NEPpv5hMRoNQqeHr5oOMAQ="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index 291da3c786..292d10f50a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-La6d4se3mvoBIWjlw61ehIvoEwHqeny+4/MBGpeTYE8="; + sha256 = "sha256-o+PVzVLg1scAqBq6PSPj4PXWU7u4v/4PHMob3JhIBRk="; }; - cargoHash = "sha256-Wp+e83/lGUlZwSJcHcfGXAeUfiy9fDVjZJsWKbUIQGA="; + cargoHash = "sha256-s9FffL9Rvbj3WzlETsBTeKkuABj/MDnluRN9jQShvbw="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index a0ab272c2a..01419c3861 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.08"; + version = "0.18.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-ipiR7vLNF0+y0YtXZC0qpp361lfpXzlIp3eLUbn0oXc="; + hash = "sha256-rZPfo5PKNXsjNuKNI7nH6JWC/enQIkvREcbgxZCoxEU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix b/third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix index 8ccc01d57b..586079473d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/epub2txt2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "epub2txt2"; - version = "2.07"; + version = "2.08"; src = fetchFromGitHub { owner = "kevinboone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-/P81ZXhB0wyRx2bb/CO7+kTTNspYKoGUpBGLb8Yfb5I="; + sha256 = "sha256-YFaXkcIdat2cn1ITYFyG1hxbbepqcxvyJ6ZzDo4dVYI="; }; makeFlags = [ "CC:=$(CC)" "PREFIX:=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix index 456b2c568d..f322a6f7d7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; + hash = "sha256-kYU3dcP6qVIkaOwSPNbedGYqy21RFkdZlqyk3Cw778g="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix index 76271f3d38..c7801348c4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-1IFjnBIa/xCX2nY0RHhj/7OCYErY9QB/OBMaf3wDvrc="; + hash = "sha256-P/GkroAyE2mDEqLIyOqUGvauhPHVvaVRxpDkGv+BCqw="; }; - vendorHash = "sha256-USMDIgB4LhI4kzSg2kkCXfbN9t49WEg0fUtAcZkngac="; + vendorHash = "sha256-PDyqscKzL2tGVrUckbedt0offgsCpDjxtnSeqggTM+A="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix index 0e1e766456..50d0de133e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/pbgopy/default.nix @@ -18,6 +18,6 @@ buildGoModule rec { mainProgram = "pbgopy"; homepage = "https://github.com/nakabonne/pbgopy"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix b/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix index 9da86f2a61..5f6bf17eb4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix @@ -5,19 +5,19 @@ buildNpmPackage rec { pname = "reveal-md"; - version = "5.5.2"; + version = "6.1.2"; src = fetchFromGitHub { owner = "webpro"; repo = "reveal-md"; rev = version; - hash = "sha256-Uge7N6z9O1wc+nW/0k5qz+CPYbYgr7u2mulH75pXvHY="; + hash = "sha256-MPNxQpof36XHg3Zl7fHkyCXnoDOcRvMiMiPH29GEWqE="; }; - npmDepsHash = "sha256-+gzur0pAmZe4nrDxNQwjFn/hM9TvZEd6JzLOnJLhNtg="; + npmDepsHash = "sha256-535tauun6ysPDC096ttPpvJZ+RSZ75aY8mVKj8mnMJI="; env = { - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; + PUPPETEER_SKIP_DOWNLOAD = true; }; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/sad/default.nix b/third_party/nixpkgs/pkgs/tools/text/sad/default.nix index a3fba1a8d0..1b8dad394c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sad/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.29"; + version = "0.4.30"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-TLVUvz/phAy+ljIsdv4GVSFHTAZ5ywQs32WHsu9g9Fc="; + hash = "sha256-pTCdoKY/+ubUY3adN/Cqop0Gvuqh6Bs55arjT9mjQ18="; }; - cargoHash = "sha256-4XmTxeKbdC4HRownFlEc4GrSVimKkQg/yNI0us7gzQI="; + cargoHash = "sha256-ndl0jFQA30h90nnEcIl2CXfF/+cuj/UqUV/7ilsUPb4="; nativeBuildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/topfew/default.nix b/third_party/nixpkgs/pkgs/tools/text/topfew/default.nix index 967e4e1403..b908d41b64 100644 --- a/third_party/nixpkgs/pkgs/tools/text/topfew/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/topfew/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "topfew"; - version = "0.9.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "timbray"; repo = "topfew"; - rev = version; - hash = "sha256-6ydi/4LyqTLKpR00f4zpcrTnCorlhnsBOxdhzBMNcRI="; + rev = "v${version}"; + hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 5e9df9f513..91c6c9520c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.7"; + version = "11.0"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-Jr73UoyJfhtXLnYgOPh+jqKc3XZs+WMwJaO5nuD+Vmw="; + hash = "sha256-ePXoinOnm9BgMeCGTtWE3ahDsEtzReAiDLMwm9cB3tE="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 148e51f55d..ed0f0fd393 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -58,13 +58,12 @@ let # resolve dependencies of the packages that affect the runtime all = let - # order of packages is irrelevant - packages = builtins.sort (a: b: a.pname < b.pname) (ensurePkgSets (requiredTeXPackages tl)); + packages = ensurePkgSets (requiredTeXPackages tl); runtime = builtins.partition (p: p.outputSpecified or false -> builtins.elem (p.tlOutputName or p.outputName) [ "out" "tex" "tlpkg" ]) packages; keySet = p: { - key = ((p.name or "${p.pname}-${p.version}") + "-" + p.tlOutputName or p.outputName or ""); + key = p.pname or p.name + lib.optionalString (p.outputSpecified or false) ("-" + p.tlOutputName or p.outputName or ""); inherit p; tlDeps = if p ? tlDeps then ensurePkgSets p.tlDeps else (p.requiredTeXPackages or (_: [ ]) tl); }; @@ -211,7 +210,7 @@ let __overrideTeXConfig = newArgs: let appliedArgs = if builtins.isFunction newArgs then newArgs args else newArgs; in self (args // { __fromCombineWrapper = false; } // appliedArgs); - withPackages = reqs: self (args // { requiredTeXPackages = ps: requiredTeXPackages ps ++ reqs ps; __fromCombineWrapper = false; }); + withPackages = reqs: self (args // { requiredTeXPackages = ps: reqs ps ++ requiredTeXPackages ps; __fromCombineWrapper = false; }); }; # TeXLive::TLOBJ::fmtutil_cnf_lines diff --git a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix index 7f234ae524..292f571611 100644 --- a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KonradIT/gopro-linux"; platforms = platforms.unix; license = licenses.gpl3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "gopro"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix b/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix index 6db6903920..aef05e2a73 100644 --- a/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Skf3wY52B6KnWS8YurAL0b5Sdkvp4YYn3IvHrAKyvK8="; - arm64-linux_hash = "sha256-66OCz13eLyAfEC3kYUniqq+QhsHoZNBJieXmmsLG5eM="; - x64-osx_hash = "sha256-6cNpfcjwgfxZRlBnZQrZLMPaXDHEXSbS3Z/qcx1Z3HA="; - arm64-osx_hash = "sha256-OkM+LgqXOHzyzEWH6D3czH86Sncym9FpfTFaacp2aN0="; + x64-linux_hash = "sha256-LMAY1UIwvB+ne4rpwLKaYO6QGTwdiS3YBndr73zIzvQ="; + arm64-linux_hash = "sha256-by3PSYdN7TPjA0Cx4pfzIbpZ/YVU1agfcuvuZh6mbfU="; + x64-osx_hash = "sha256-/YqdlVktgbBUNdm+mAD053pf6wCMXYt6gQP+iTQdKqw="; + arm64-osx_hash = "sha256-2RRQGNTztK14KDFRqgpagNCWTizHVNY67psaxFfyDZ4="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "6.0.2"; + version = "7.0.0"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix index 5133d4477f..97b3477c42 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-ovPXjSHTCv7ke8k0iOqB4jB4R3cRMJ5cFkpptPrAr+g="; + hash = "sha256-eO/BZ59MZI1zaRCkbhBks55Jbf1i0M4XFHjAV03xp9k="; }; - vendorHash = "sha256-39CORZ5qqbMJuTzYt1sKbHPPYkQEwQWSIQ4hWqdUFmk="; + vendorHash = "sha256-FPM0q1ZVDfo00Z6QEXqtqfx77qkq5HhB+3vF9z9zrM0="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix index 53c2802068..56d2b4276a 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-N7To46D8a64/fVDHOuRWt8xQduh/Lvi5C3/N9FhujmI="; + hash = "sha256-W31B803XTdJ7ExeIwsTAac7RyAX7TZI3UKLURkotjBI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 6869bfad76..cd24af3217 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,13 +8,13 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "0-unstable-2024-04-08"; + version = "0-unstable-2024-06-17"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "57dea8de065f5a155d97a32a929bbb2b1ba6b53a"; - sha256 = "sha256-mp/Y13MwdKo7f3E9S0Pnvb3Cb4d6szkIQOFteMrVxCk="; + rev = "1c0cd6d4f13454f0c72148b4c4a1c1e3b728205e"; + sha256 = "sha256-E9UTq9sNBdg+ANO8b9Nga/JBD+Tt9O5QV5NQmbY6GLE="; }; minimalOCamlVersion = "5.0"; diff --git a/third_party/nixpkgs/pkgs/top-level/agda-packages.nix b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix index 1e0e6e0a2d..d1097a4832 100644 --- a/third_party/nixpkgs/pkgs/top-level/agda-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix @@ -35,5 +35,7 @@ let agdarsec = callPackage ../development/libraries/agda/agdarsec { }; _1lab = callPackage ../development/libraries/agda/1lab { }; + + generics = callPackage ../development/libraries/agda/generics { }; }; in mkAgdaPackages Agda diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 1755693169..c5890512c0 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -86,6 +86,13 @@ mapAliases ({ ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 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 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 + apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = antimicrox; # Added 2021-10-31 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 @@ -688,6 +695,7 @@ mapAliases ({ 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 + libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 @@ -914,18 +922,18 @@ mapAliases ({ netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 - nextcloud26 = throw '' - Nextcloud v26 has been removed from `nixpkgs` as the support for is dropped - by upstream in 2024-04. Please upgrade to at least Nextcloud v27 by declaring + nextcloud27 = throw '' + Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring - services.nextcloud.package = pkgs.nextcloud27; + services.nextcloud.package = pkgs.nextcloud28; in your NixOS config. - WARNING: if you were on Nextcloud 25 you have to upgrade to Nextcloud 26 - first on 23.11 because Nextcloud doesn't support upgrades across multiple major versions! - ''; # Added 2023-10-13 - nextcloud25Packages = throw "Nextcloud25 is EOL!"; # Added 2023-10-13 + WARNING: if you were on Nextcloud 26 you have to upgrade to Nextcloud 27 + first on 24.05 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2024-06-25 + nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 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 @@ -1110,6 +1118,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 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 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 @@ -1169,6 +1178,7 @@ mapAliases ({ readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 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 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; @@ -1346,6 +1356,7 @@ mapAliases ({ transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 transmission-gtk = lib.warn (transmission3Warning {suffix = "-gtk";}) transmission_3-gtk; # Added 2024-06-10 transmission-qt = lib.warn (transmission3Warning {suffix = "-qt";}) transmission_3-qt; # Added 2024-06-10 + treefmt = treefmt2; # 2024-06-28 libtransmission = lib.warn (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 2d82d93031..c179840d4b 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -411,8 +411,6 @@ with pkgs; caroline = callPackage ../development/libraries/caroline { }; - cartridges = callPackage ../applications/misc/cartridges { }; - castget = callPackage ../applications/networking/feedreaders/castget { }; catatonit = callPackage ../applications/virtualization/catatonit { }; @@ -587,8 +585,6 @@ with pkgs; dt = callPackage ../tools/text/dt { }; - dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; - dufs = callPackage ../servers/http/dufs { }; dynein = callPackage ../development/tools/database/dynein { @@ -2886,6 +2882,10 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; + saunafs = callPackage ../by-name/sa/saunafs/package.nix { + boost = boost185; + }; + mucommander = callPackage ../applications/file-managers/mucommander { }; nnn = callPackage ../applications/file-managers/nnn { }; @@ -3613,6 +3613,8 @@ with pkgs; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + dazel = python3Packages.callPackage ../development/tools/dazel { }; + dcap = callPackage ../tools/networking/dcap { }; deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; @@ -4550,14 +4552,14 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 buildGoModule = buildGoModule.override { - go = go_1_21.overrideAttrs { + go = go_1_22.overrideAttrs { pname = "cloudflare-go"; - version = "0-unstable-2023-12-06"; + version = "1.22.2-devel-cf"; src = fetchFromGitHub { owner = "cloudflare"; repo = "go"; - rev = "34129e47042e214121b6bbff0ded4712debed18e"; - sha256 = "sha256-RA9KTY4cSxIt7dyJgAFQPemc6YBgcSwc/hqB4JHPxng="; + rev = "ec0a014545f180b0c74dfd687698657a9e86e310"; + sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU="; }; }; }; @@ -5153,6 +5155,10 @@ with pkgs; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; + fedimint = callPackage ../by-name/fe/fedimint/package.nix { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + fetch-scm = callPackage ../tools/misc/fetch-scm { }; fiano = callPackage ../tools/misc/fiano { }; @@ -5270,8 +5276,6 @@ with pkgs; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - fx = callPackage ../development/tools/fx { }; - tllist = callPackage ../development/libraries/tllist { }; fcft = callPackage ../development/libraries/fcft { }; @@ -5483,6 +5487,10 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; + hyprland = callPackage ../by-name/hy/hyprland/package.nix { + libliftoff = libliftoff_0_4; + }; + hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5685,8 +5693,8 @@ 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/d8c6ca264bdf9a6a0f03c46dbf3509210367624a/package.json#L116 - electron = electron_28; + # electron version from: https://github.com/logseq/logseq/blob/0.10.9/package.json#L116 + electron = electron_27; }; long-shebang = callPackage ../misc/long-shebang { }; @@ -6224,10 +6232,6 @@ with pkgs; routersploit = callPackage ../tools/security/routersploit { }; - routinator = callPackage ../servers/routinator { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - rsbep = callPackage ../tools/backup/rsbep { }; rsbkb = callPackage ../tools/text/rsbkb { }; @@ -6282,8 +6286,6 @@ with pkgs; mongoaudit = callPackage ../tools/security/mongoaudit { }; - mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; moosefs = callPackage ../tools/filesystems/moosefs { }; @@ -7468,8 +7470,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - emote = callPackage ../tools/inputmethods/emote { }; - engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; epub2txt2 = callPackage ../tools/text/epub2txt2 { }; @@ -10206,10 +10206,6 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { - libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; - }; - jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; }; @@ -10826,11 +10822,8 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud27 nextcloud28 nextcloud29; + nextcloud28 nextcloud29; - nextcloud27Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/27.json; - }; nextcloud28Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/28.json; }; @@ -11011,8 +11004,6 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; - notary = callPackage ../tools/security/notary { }; - notation = callPackage ../tools/security/notation { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -11473,8 +11464,6 @@ with pkgs; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; - paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { }; - pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 @@ -12186,7 +12175,7 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; railway = callPackage ../development/tools/railway { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; quota = if stdenv.isLinux then linuxquota else unixtools.quota; @@ -12263,8 +12252,6 @@ with pkgs; redpanda-client = callPackage ../servers/redpanda { }; - redpanda-server = redpanda-client.server; - redsocks = callPackage ../tools/networking/redsocks { }; rep = callPackage ../development/tools/rep { }; @@ -14569,7 +14556,7 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; clipbuzz = callPackage ../tools/misc/clipbuzz { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; xclip = callPackage ../tools/misc/xclip { }; @@ -15188,8 +15175,6 @@ with pkgs; clean = callPackage ../development/compilers/clean { }; - clickable = python3Packages.callPackage ../development/tools/clickable { }; - closurecompiler = callPackage ../development/compilers/closure { }; cmdstan = callPackage ../development/compilers/cmdstan { }; @@ -16027,8 +16012,7 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; @@ -16178,7 +16162,7 @@ with pkgs; else if platform.isLinux then 17 else if platform.isWasm then 16 # For unknown systems, assume the latest version is required. - else 17; + 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. @@ -16362,11 +16346,14 @@ with pkgs; ocaml-crunch = ocamlPackages.crunch.bin; + inherit (ocaml-ng.ocamlPackages_4_14) + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 + ocamlformat_0_22_4; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2; + ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0 + ocamlformat_0_26_1 ocamlformat_0_26_2; inherit (ocamlPackages) odig; @@ -16455,7 +16442,9 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + 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. + }); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; @@ -16579,7 +16568,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { - zig = zig_0_12; + zig = buildPackages.zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; @@ -16646,13 +16635,11 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - critcmp = callPackage ../development/tools/rust/critcmp { }; devspace = callPackage ../development/tools/misc/devspace { }; @@ -17866,14 +17853,11 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_5; - apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; - apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; - apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; - apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; - apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; - apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; - apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; + inherit (callPackages ../servers/apache-kafka { }) + apacheKafka_3_6 + apacheKafka_3_7; + + apacheKafka = apacheKafka_3_7; apng2gif = callPackage ../tools/graphics/apng2gif { }; @@ -18325,8 +18309,6 @@ with pkgs; cov-build = callPackage ../development/tools/analysis/cov-build { }; - cppcheck = callPackage ../development/tools/analysis/cppcheck { }; - cpplint = callPackage ../development/tools/analysis/cpplint { }; credstash = with python3Packages; toPythonApplication credstash; @@ -19785,6 +19767,10 @@ with pkgs; yodl = callPackage ../development/tools/misc/yodl { }; + yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix { + jre = jdk17; + }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; @@ -19817,24 +19803,12 @@ with pkgs; then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; - abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.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 - 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 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; - abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.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 - 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 @@ -20002,7 +19976,7 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { - zig = zig_0_11; + zig = buildPackages.zig_0_11; }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -21332,13 +21306,11 @@ with pkgs; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) - icu58 icu60 icu63 icu64 icu66 icu67 - icu68 icu69 icu70 icu71 @@ -21993,9 +21965,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; @@ -22225,7 +22194,8 @@ with pkgs; liblc3 = callPackage ../development/libraries/liblc3 { }; - libliftoff = callPackage ../development/libraries/libliftoff { }; + inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5; + libliftoff = libliftoff_0_5; liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; @@ -23776,8 +23746,7 @@ with pkgs; flatbuffers = callPackage ../development/libraries/flatbuffers { }; - nanopb = callPackage ../development/libraries/nanopb { }; - nanopbMalloc = callPackage ../development/libraries/nanopb { mallocBuild = true; }; + nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; }; gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; @@ -25065,6 +25034,17 @@ with pkgs; go = buildPackages.go_1_22; }; + # requires a newer Apple SDK + go_1_23 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.23.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo123Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_23; + }; + buildGo123Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_23; + }; + leaps = callPackage ../development/tools/leaps { }; ### DEVELOPMENT / HARE @@ -25098,7 +25078,11 @@ with pkgs; # Armed Bear Common Lisp abcl = wrapLisp { - pkg = callPackage ../development/compilers/abcl { }; + pkg = callPackage ../development/compilers/abcl { + # https://armedbear.common-lisp.dev/ lists OpenJDK 17 as the highest + # supported JDK. + jdk = openjdk17; + }; faslExt = "abcl"; }; @@ -25155,17 +25139,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_4_5 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_5; + sbcl_2_4_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_4_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -26233,7 +26217,6 @@ with pkgs; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; - prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mongodb-exporter = callPackage ../servers/monitoring/prometheus/mongodb-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; @@ -30122,7 +30105,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_24 docker_25 docker_26; + docker_24 docker_25 docker_26 docker_27; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -32787,7 +32770,7 @@ with pkgs; mailspring = callPackage ../applications/networking/mailreaders/mailspring { }; - memento = libsForQt5.callPackage ../applications/video/memento { }; + memento = qt6Packages.callPackage ../applications/video/memento { }; mm = callPackage ../applications/networking/instant-messengers/mm { }; @@ -32831,14 +32814,12 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -32868,8 +32849,6 @@ with pkgs; pythonPackages = python3Packages; }; - n8n = callPackage ../applications/networking/n8n { }; - neomutt = darwin.apple_sdk_11_0.callPackage ../applications/networking/mailreaders/neomutt { }; neosay = callPackage ../applications/networking/instant-messengers/neosay { }; @@ -33169,7 +33148,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -34959,14 +34938,10 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; - neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; @@ -35099,6 +35074,10 @@ with pkgs; vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); + vscode-js-debug = callPackage ../by-name/vs/vscode-js-debug/package.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; @@ -36678,8 +36657,6 @@ with pkgs; left4gore-bin = callPackage ../games/left4gore { }; - lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { }; - liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; liberation-circuit = callPackage ../games/liberation-circuit { }; @@ -36906,12 +36883,6 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-unwrapped = kdePackages.callPackage ../games/prismlauncher { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - prismlauncher = kdePackages.callPackage ../games/prismlauncher/wrapper.nix { }; - pong3d = callPackage ../games/pong3d { }; pokerth = libsForQt5.callPackage ../games/pokerth { @@ -38029,7 +38000,7 @@ with pkgs; protobuf = protobuf_21; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp_202206.override { + abseil-cpp = abseil-cpp.override { static = true; cxxStandard = "20"; }; @@ -38049,8 +38020,6 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -38239,6 +38208,7 @@ with pkgs; coqPackages_8_17 coq_8_17 coqPackages_8_18 coq_8_18 coqPackages_8_19 coq_8_19 + coqPackages_8_20 coq_8_20 coqPackages coq ; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 5cea3d663b..5998f4234e 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -38,6 +38,8 @@ let coq-bits = callPackage ../development/coq-modules/coq-bits {}; coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + coq-hammer = callPackage ../development/coq-modules/coq-hammer { }; + coq-hammer-tactics = callPackage ../development/coq-modules/coq-hammer/tactics.nix { }; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coq-lsp = callPackage ../development/coq-modules/coq-lsp {}; coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; @@ -198,6 +200,7 @@ in rec { coq_8_17 = mkCoq "8.17"; coq_8_18 = mkCoq "8.18"; coq_8_19 = mkCoq "8.19"; + coq_8_20 = mkCoq "8.20"; coqPackages_8_5 = mkCoqPackages coq_8_5 // { __attrsFailEvaluation = true; }; coqPackages_8_6 = mkCoqPackages coq_8_6 // { __attrsFailEvaluation = true; }; @@ -214,6 +217,7 @@ in rec { coqPackages_8_17 = mkCoqPackages coq_8_17 // { __attrsFailEvaluation = true; }; coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; + coqPackages_8_20 = mkCoqPackages coq_8_20 // { __attrsFailEvaluation = true; }; coqPackages = let cp = recurseIntoAttrs coqPackages_8_19; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; diff --git a/third_party/nixpkgs/pkgs/top-level/cubocore-packages.nix b/third_party/nixpkgs/pkgs/top-level/cubocore-packages.nix index 3c6ed65e92..e7cae57831 100644 --- a/third_party/nixpkgs/pkgs/top-level/cubocore-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/cubocore-packages.nix @@ -74,7 +74,7 @@ let }; coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { - inherit (lxqt) qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; inherit libcprime libcsys; }; diff --git a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix index d34a37294a..7f01f4310c 100644 --- a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix @@ -77,6 +77,8 @@ let saxpy = final.callPackage ../development/cuda-modules/saxpy { }; nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; + + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-python-test.nix { }; }); mkVersionedPackageName = diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index cf4d860a82..104d8821ff 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -337,6 +337,8 @@ in { cpupower = callPackage ../os-specific/linux/cpupower { }; + deepin-anything-module = callPackage ../os-specific/linux/deepin-anything-module { }; + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; dddvb = callPackage ../os-specific/linux/dddvb { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 46866fd883..259864f22a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -466,6 +466,8 @@ let eqaf = callPackage ../development/ocaml-modules/eqaf { }; + eqaf-cstruct = callPackage ../development/ocaml-modules/eqaf/cstruct.nix { }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 45e3ec1865..4a11a17328 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -13021,6 +13021,19 @@ with self; { }; }; + IOSocketSocks = buildPerlPackage { + pname = "IO-Socket-Socks"; + version = "0.74"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/IO-Socket-Socks-0.74.tar.gz"; + hash = "sha256-N/Bxos9LqPCQoil8ZIK3osUJ61Lc1s5dgDXU7ixoJLE="; + }; + meta = { + description = "Provides a way to create socks client or server both 4 and 5 version"; + license = lib.licenses.free; + }; + }; + IOSocketTimeout = buildPerlModule { pname = "IO-Socket-Timeout"; version = "0.32"; @@ -15919,10 +15932,10 @@ with self; { Minion = buildPerlPackage { pname = "Minion"; - version = "10.25"; + version = "10.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.25.tar.gz"; - hash = "sha256-C+CoN1N2iJ2gRgRpY4TAz5iyYh0mUNnrAwf25LlAra0="; + url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.30.tar.gz"; + hash = "sha256-twS9ZuxK8cAzlGifAsCsBIDr0GzpzKFykVAbkgLG7Rw="; }; propagatedBuildInputs = [ Mojolicious YAMLLibYAML ]; meta = { @@ -23970,12 +23983,12 @@ with self; { SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "10.0.0"; + version = "10.2.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-FK2SaerA/GB0ZAg/QXG9Ig1Cvpg6v9lh1sKPjYU52M8="; + hash = "sha256-xpgZeXk9QefqbBMsvcMh/Cg/XFGEiVi3FbU/jBbSIr0="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -29122,10 +29135,10 @@ with self; { YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.036"; + version = "0.38.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.036.tar.gz"; - hash = "sha256-yLTlBYSt+S73Vz9rsB1u1Y5iF2MsV0J7cnTPp8pG/Bs="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-v0.38.0.tar.gz"; + hash = "sha256-qBlGXFL2o0EEmjlCdCwI4E8olLKmZILkOn9AfOELTqA="; }; buildInputs = [ TestDeep TestWarn ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index a10f40d615..09a3029bda 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -504,6 +504,7 @@ mapAliases ({ sharkiqpy = sharkiq; # added 2022-05-21 shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12 sip_4 = sip4; # added 2024-01-07 + slackclient = slack-sdk; # added 2024-06-27 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 3067e18bae..6b165d64e4 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -253,6 +253,8 @@ self: super: with self; { aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + aiohttp-middlewares = callPackage ../development/python-modules/aiohttp-middlewares { }; + aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { }; aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { }; @@ -3482,7 +3484,7 @@ self: super: with self; { dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; dm-tree = callPackage ../development/python-modules/dm-tree { - abseil-cpp = pkgs.abseil-cpp_202103.override { + abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; }; }; @@ -4033,6 +4035,10 @@ self: super: with self; { exifread = callPackage ../development/python-modules/exifread { }; + exiv2 = callPackage ../development/python-modules/exiv2 { + inherit (pkgs) exiv2; + }; + expandvars = callPackage ../development/python-modules/expandvars { }; expects = callPackage ../development/python-modules/expects { }; @@ -4451,6 +4457,10 @@ self: super: with self; { flet-runtime = callPackage ../development/python-modules/flet-runtime { }; + flexcache = callPackage ../development/python-modules/flexcache { }; + + flexparser = callPackage ../development/python-modules/flexparser { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -4576,6 +4586,8 @@ self: super: with self; { freebox-api = callPackage ../development/python-modules/freebox-api { }; + freertos-gdb = callPackage ../development/python-modules/freertos-gdb { }; + freetype-py = callPackage ../development/python-modules/freetype-py { }; freezegun = callPackage ../development/python-modules/freezegun { }; @@ -7803,6 +7815,8 @@ self: super: with self; { mox3 = callPackage ../development/python-modules/mox3 { }; + mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { }; + mpd2 = callPackage ../development/python-modules/mpd2 { }; mpegdash = callPackage ../development/python-modules/mpegdash { }; @@ -9202,9 +9216,7 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { - abseil-cpp = pkgs.abseil-cpp_202301; - }; + onnx = callPackage ../development/python-modules/onnx { }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { inherit (pkgs) protobuf; @@ -10140,7 +10152,9 @@ self: super: with self; { pyrender = callPackage ../development/python-modules/pyrender { }; - pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { }; + pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { + inherit (pkgs.darwin.apple_sdk.frameworks) SystemConfiguration; + }; pyrevolve = callPackage ../development/python-modules/pyrevolve { }; @@ -10697,7 +10711,9 @@ self: super: with self; { py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); - py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { + inherit (pkgs) exiv2; + }; py3langid = callPackage ../development/python-modules/py3langid { }; @@ -12538,6 +12554,8 @@ self: super: with self; { python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { }; + python-logging-loki = callPackage ../development/python-modules/python-logging-loki { }; + python-logstash = callPackage ../development/python-modules/python-logstash { }; python-louvain = callPackage ../development/python-modules/python-louvain { }; @@ -14155,8 +14173,6 @@ self: super: with self; { slack-sdk = callPackage ../development/python-modules/slack-sdk { }; - slackclient = callPackage ../development/python-modules/slackclient { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; sleepyq = callPackage ../development/python-modules/sleepyq { }; @@ -14305,6 +14321,8 @@ self: super: with self; { solc-select = callPackage ../development/python-modules/solc-select { }; + solidpython2 = callPackage ../development/python-modules/solidpython2 { }; + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); somajo = callPackage ../development/python-modules/somajo { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix b/third_party/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix index a80b40d360..489c378abf 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix @@ -52,6 +52,7 @@ let pkgsMusl = true; pkgsStatic = true; pkgsCross = true; + pkgsx86_64Darwin = true; pkgsi686Linux = true; pkgsLinux = true; pkgsExtraHardening = true; @@ -70,9 +71,11 @@ let override = true; __functor = true; __functionArgs = true; + __splicedPackages = true; newScope = true; scope = true; pkgs = true; + test-pkgs = true; buildHaskellPackages = true; buildPackages = true; diff --git a/third_party/nixpkgs/shell.nix b/third_party/nixpkgs/shell.nix new file mode 100644 index 0000000000..d9e94eb281 --- /dev/null +++ b/third_party/nixpkgs/shell.nix @@ -0,0 +1,30 @@ +# A shell to get tooling for Nixpkgs development +# +# Note: We intentionally don't use Flakes here, +# because every time you change any file and do another `nix develop`, +# it would create another copy of the entire ~500MB tree in the store. +# See https://github.com/NixOS/nix/pull/6530 for the future +{ + system ? builtins.currentSystem, +}: +let + pinnedNixpkgs = builtins.fromJSON (builtins.readFile ci/pinned-nixpkgs.json); + + nixpkgs = fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz"; + sha256 = pinnedNixpkgs.sha256; + }; + + pkgs = import nixpkgs { + inherit system; + config = {}; + overlays = []; + }; +in +pkgs.mkShellNoCC { + packages = [ + # The default formatter for Nix code + # https://github.com/NixOS/nixfmt + pkgs.nixfmt-rfc-style + ]; +}